diff options
| author | Alexander Bokovoy <ab@samba.org> | 2006-02-26 15:02:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:10:24 -0500 |
| commit | e99814b6ed0e4446ed60c765a4b67798506834dc (patch) | |
| tree | 64421cb5a1dbfe0f78878848da06b7e9e360eada | |
| parent | f8fccdfd370d6a0291bd38c2cd081a605f0bceac (diff) | |
| download | samba-e99814b6ed0e4446ed60c765a4b67798506834dc.tar.gz samba-e99814b6ed0e4446ed60c765a4b67798506834dc.tar.bz2 samba-e99814b6ed0e4446ed60c765a4b67798506834dc.zip | |
r13695: Make code consistent with documentation. :-)
smbcontrol was sending messages designated for nmbd and winbindd to smbd. Thus, nmbd and winbindd
were "unshutdownable".
(This used to be commit 52e9b5f89f4889ad97a049eade4957fb15f7b8a5)
| -rw-r--r-- | source3/utils/smbcontrol.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index 7e18e09dad..76d699c54f 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/utils/smbcontrol.c @@ -823,13 +823,16 @@ static struct process_id parse_dest(const char *dest) dest = "winbindd"; } - /* Check for numeric pid number */ + + if (!(strequal(dest, "winbindd") || strequal(dest, "nmbd"))) { + /* Check for numeric pid number */ - result = interpret_pid(dest); + result = interpret_pid(dest); - /* Zero isn't valid if not smbd. */ - if (result.pid && procid_valid(&result)) { - return result; + /* Zero isn't valid if not smbd. */ + if (result.pid && procid_valid(&result)) { + return result; + } } /* Look up other destinations in pidfile directory */ |