svn commit: samba r23594 - in branches: SAMBA_3_0/source/lib SAMBA_3_0_26/source/lib

vlendec at samba.org vlendec at samba.org
Sun Jun 24 13:24:21 GMT 2007


Author: vlendec
Date: 2007-06-24 13:24:20 +0000 (Sun, 24 Jun 2007)
New Revision: 23594

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

Log:
Fix parsing of local pids if cluster support is compiled in but no
cluster is used

Modified:
   branches/SAMBA_3_0/source/lib/util.c
   branches/SAMBA_3_0_26/source/lib/util.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/util.c
===================================================================
--- branches/SAMBA_3_0/source/lib/util.c	2007-06-22 22:37:07 UTC (rev 23593)
+++ branches/SAMBA_3_0/source/lib/util.c	2007-06-24 13:24:20 UTC (rev 23594)
@@ -3143,6 +3143,10 @@
 		result.vnn = vnn;
 		result.pid = pid;
 	}
+	else if (sscanf(pid_string, "%u", &pid) == 1) {
+		result.vnn = NONCLUSTER_VNN;
+		result.pid = pid;
+	}
 	else {
 		result.vnn = NONCLUSTER_VNN;
 		result.pid = -1;

Modified: branches/SAMBA_3_0_26/source/lib/util.c
===================================================================
--- branches/SAMBA_3_0_26/source/lib/util.c	2007-06-22 22:37:07 UTC (rev 23593)
+++ branches/SAMBA_3_0_26/source/lib/util.c	2007-06-24 13:24:20 UTC (rev 23594)
@@ -3123,6 +3123,10 @@
 		result.vnn = vnn;
 		result.pid = pid;
 	}
+	else if (sscanf(pid_string, "%u", &pid) == 1) {
+		result.vnn = NONCLUSTER_VNN;
+		result.pid = pid;
+	}
 	else {
 		result.vnn = NONCLUSTER_VNN;
 		result.pid = -1;



More information about the samba-cvs mailing list