Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP4:Update
sssd.12196
0015-UTILS-Fixing-duplication-of-pid-file-decla...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0015-UTILS-Fixing-duplication-of-pid-file-declaration.patch of Package sssd.12196
From 13cfdbc3dca565ab4876101f3249f325f19d48fc Mon Sep 17 00:00:00 2001 From: Petr Cech <pcech@redhat.com> Date: Fri, 5 Aug 2016 14:39:39 +0200 Subject: [PATCH 2/2] UTILS: Fixing duplication of pid file declaration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: https://fedorahosted.org/sssd/ticket/2978 Reviewed-by: Fabiano FidĂȘncio <fabiano@fidencio.org> Reviewed-by: Jakub Hrozek <jhrozek@redhat.com> (cherry picked from commit 08cd034c8584b6f058cf565ce66f7f9f7120622f) (cherry picked from commit 1d897ffa2f6c675a98e27b4f8f336dcda6ea8c80) --- src/monitor/monitor.c | 3 +-- src/tools/tools_util.h | 3 --- src/util/util.h | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index 46e3de3ed..03134181c 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -81,7 +81,6 @@ /* name of the monitor server instance */ #define MONITOR_NAME "sssd" -#define SSSD_PIDFILE_PATH PID_PATH"/"MONITOR_NAME".pid" /* Special value to leave the Kerberos Replay Cache set to use * the libkrb5 defaults @@ -1504,7 +1503,7 @@ static int monitor_cleanup(void) int ret; errno = 0; - ret = unlink(SSSD_PIDFILE_PATH); + ret = unlink(SSSD_PIDFILE); if (ret == -1) { ret = errno; DEBUG(SSSDBG_FATAL_FAILURE, diff --git a/src/tools/tools_util.h b/src/tools/tools_util.h index c5990b012..14e17326f 100644 --- a/src/tools/tools_util.h +++ b/src/tools/tools_util.h @@ -27,9 +27,6 @@ #include "util/util.h" -#define SSSD_PIDFILE ""PID_PATH"/sssd.pid" -#define MAX_PID_LENGTH 10 - #define BAD_POPT_PARAMS(pc, msg, val, label) do { \ usage(pc, msg); \ val = EXIT_FAILURE; \ diff --git a/src/util/util.h b/src/util/util.h index 8adeb0977..604d601ae 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -53,6 +53,10 @@ #include "util/sss_format.h" #include "util/debug.h" +/* name of the monitor server instance */ +#define SSSD_PIDFILE PID_PATH"/sssd.pid" +#define MAX_PID_LENGTH 10 + #define _(STRING) gettext (STRING) #define ENUM_INDICATOR "*" -- 2.20.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor