diff options
| author | Volker Lendecke <vl@samba.org> | 2010-07-04 16:28:13 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-07-04 17:29:23 +0200 |
| commit | 7f0e6df88345c1154f19fd263966ad20c73f5d52 (patch) | |
| tree | 683ecaec64b2ed779300d038a9e70bdc7dbf8f63 /source3/winbindd | |
| parent | 5a3c64668a33fc3fa8f87a78d06fa040eed9f8f8 (diff) | |
| download | samba-7f0e6df88345c1154f19fd263966ad20c73f5d52.tar.gz samba-7f0e6df88345c1154f19fd263966ad20c73f5d52.tar.bz2 samba-7f0e6df88345c1154f19fd263966ad20c73f5d52.zip | |
s3: Pass the new server_id through reinit_after_fork
Diffstat (limited to 'source3/winbindd')
| -rw-r--r-- | source3/winbindd/winbindd.c | 8 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_dual.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 34fd271194..cdbf2d62ca 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -1122,6 +1122,7 @@ int main(int argc, char **argv, char **envp) poptContext pc; int opt; TALLOC_CTX *frame = talloc_stackframe(); + NTSTATUS status; /* glibc (?) likes to print "User defined signal 1" and exit if a SIGUSR[12] is received before a handler is installed */ @@ -1278,9 +1279,10 @@ int main(int argc, char **argv, char **envp) * winbindd-specific resources we must free yet. JRA. */ - if (!NT_STATUS_IS_OK(reinit_after_fork(winbind_messaging_context(), - winbind_event_context(), - false))) { + status = reinit_after_fork(winbind_messaging_context(), + winbind_event_context(), + procid_self(), false); + if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("reinit_after_fork() failed\n")); exit(1); } diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c index 2ae32e793c..e506d2a53a 100644 --- a/source3/winbindd/winbindd_dual.c +++ b/source3/winbindd/winbindd_dual.c @@ -1106,10 +1106,12 @@ bool winbindd_reinit_after_fork(const char *logfilename) { struct winbindd_domain *domain; struct winbindd_child *cl; + NTSTATUS status; - if (!NT_STATUS_IS_OK(reinit_after_fork(winbind_messaging_context(), - winbind_event_context(), - true))) { + status = reinit_after_fork(winbind_messaging_context(), + winbind_event_context(), + procid_self(), true); + if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("reinit_after_fork() failed\n")); return false; } |