svn commit: samba r13696 - in trunk/source/utils: .

ab at samba.org ab at samba.org
Sun Feb 26 15:03:25 GMT 2006


Author: ab
Date: 2006-02-26 15:03:25 +0000 (Sun, 26 Feb 2006)
New Revision: 13696

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13696

Log:
Make code consistent with documentation. :-)
smbcontrol was sending messages designated for nmbd and winbindd to smbd. Thus, nmbd and winbindd
were "unshutdownable".
Modified:
   trunk/source/utils/smbcontrol.c


Changeset:
Modified: trunk/source/utils/smbcontrol.c
===================================================================
--- trunk/source/utils/smbcontrol.c	2006-02-26 15:02:16 UTC (rev 13695)
+++ trunk/source/utils/smbcontrol.c	2006-02-26 15:03:25 UTC (rev 13696)
@@ -823,13 +823,16 @@
 		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 */



More information about the samba-cvs mailing list