The Samba-Bugzilla – Attachment 7339 Details for
Bug 8714
smbcontrol can't find the pid file of winbindd because the later is created with a different name
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
git-am fix for 3.6.next
0001-s3-pid-Catch-with-pid-filename-s-change-when-config-.patch (text/plain), 1.76 KB, created by
Jeremy Allison
on 2012-02-23 00:35:51 UTC
(
hide
)
Description:
git-am fix for 3.6.next
Filename:
MIME Type:
Creator:
Jeremy Allison
Created:
2012-02-23 00:35:51 UTC
Size:
1.76 KB
patch
obsolete
>From 7b0f26f2c841860dc796460a97de26046cd5db46 Mon Sep 17 00:00:00 2001 >From: Matthieu Patou <mat@matws.net> >Date: Tue, 24 Jan 2012 21:29:11 -0800 >Subject: [PATCH] s3-pid: Catch with pid filename's change when config file is > not smb.conf > >This is what is done in pidfile_create >(cherry picked from commit 9b43ad4fcac1eb6796973336c5614b18a054080d) >--- > source3/lib/pidfile.c | 26 +++++++++++++++++++++++++- > 1 files changed, 25 insertions(+), 1 deletions(-) > >diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c >index 88d0fb0..06fca91 100644 >--- a/source3/lib/pidfile.c >+++ b/source3/lib/pidfile.c >@@ -30,18 +30,42 @@ static char *pidFile_name = NULL; > > /* return the pid in a pidfile. return 0 if the process (or pidfile) > does not exist */ >-pid_t pidfile_pid(const char *name) >+pid_t pidfile_pid(const char *program_name) > { > int fd; > char pidstr[20]; > pid_t pid; > unsigned int ret; >+ char *name; >+ const char *short_configfile; > char * pidFile; > >+ /* Add a suffix to the program name if this is a process with a >+ * none default configuration file name. */ >+ if (strcmp( CONFIGFILE, get_dyn_CONFIGFILE()) == 0) { >+ name = SMB_STRDUP(program_name); >+ } else { >+ short_configfile = strrchr( get_dyn_CONFIGFILE(), '/'); >+ if (short_configfile == NULL) { >+ /* conf file in current directory */ >+ short_configfile = get_dyn_CONFIGFILE(); >+ } else { >+ /* full/relative path provided */ >+ short_configfile++; >+ } >+ if (asprintf(&name, "%s-%s", program_name, >+ short_configfile) == -1) { >+ smb_panic("asprintf failed"); >+ } >+ } >+ > if (asprintf(&pidFile, "%s/%s.pid", lp_piddir(), name) == -1) { >+ SAFE_FREE(name); > return 0; > } > >+ SAFE_FREE(name); >+ > fd = sys_open(pidFile, O_NONBLOCK | O_RDONLY, 0644); > if (fd == -1) { > SAFE_FREE(pidFile); >-- >1.7.7.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
metze
:
review+
Actions:
View
Attachments on
bug 8714
:
7249
|
7253
| 7339