svn commit: samba r24008 - in branches: SAMBA_3_0_25/source/lib SAMBA_3_2/source/lib SAMBA_3_2_0/source/lib

[vlendec at samba.org]

Author: vlendec
Date: 2007-07-23 19:09:19 +0000 (Mon, 23 Jul 2007)
New Revision: 24008

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

Log:
Fix Bug 4792. Thanks to David Gajewski <dgajews at math.utoledo.edu> and to
Timur I. Bakeyev for bugging me :-)

Volker

Modified:
   branches/SAMBA_3_0_25/source/lib/pidfile.c
   branches/SAMBA_3_2/source/lib/pidfile.c
   branches/SAMBA_3_2_0/source/lib/pidfile.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/lib/pidfile.c
===================================================================
--- branches/SAMBA_3_0_25/source/lib/pidfile.c	2007-07-23 15:29:56 UTC (rev 24007)
+++ branches/SAMBA_3_0_25/source/lib/pidfile.c	2007-07-23 19:09:19 UTC (rev 24008)
@@ -100,7 +100,8 @@
 			/* full/relative path provided */
 			short_configfile++;
 		}
-		slprintf( name, sizeof( name)-1, "%s-%s", program_name, short_configfile+1);
+		slprintf( name, sizeof( name)-1, "%s-%s", program_name,
+			  short_configfile );
 	}
 
 	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);

Modified: branches/SAMBA_3_2/source/lib/pidfile.c
===================================================================
--- branches/SAMBA_3_2/source/lib/pidfile.c	2007-07-23 15:29:56 UTC (rev 24007)
+++ branches/SAMBA_3_2/source/lib/pidfile.c	2007-07-23 19:09:19 UTC (rev 24008)
@@ -105,7 +105,7 @@
 			short_configfile++;
 		}
 		if (asprintf(&name, "%s-%s", program_name,
-			     short_configfile+1) == -1) {
+			     short_configfile) == -1) {
 			smb_panic("asprintf failed");
 		}
 	}

Modified: branches/SAMBA_3_2_0/source/lib/pidfile.c
===================================================================
--- branches/SAMBA_3_2_0/source/lib/pidfile.c	2007-07-23 15:29:56 UTC (rev 24007)
+++ branches/SAMBA_3_2_0/source/lib/pidfile.c	2007-07-23 19:09:19 UTC (rev 24008)
@@ -105,7 +105,7 @@
 			short_configfile++;
 		}
 		if (asprintf(&name, "%s-%s", program_name,
-			     short_configfile+1) == -1) {
+			     short_configfile) == -1) {
 			smb_panic("asprintf failed");
 		}
 	}