Changeset 96 for trunk

Timestamp:

Oct 1, 2007, 11:10:20 AM (18 years ago)

Author:

Paul Smedley

Message:

Don't free pidFile until we've closed it

File:

• trunk/samba/source/lib/pidfile.c (modified) (7 diffs)

trunk/samba/source/lib/pidfile.c

@@ -39 +39 @@
                 return 0;
         }
+
         fd = sys_open(pidFile, O_NONBLOCK | O_RDONLY, 0644);
         if (fd == -1) {
@@ -50 +51 @@
                 goto noproc;
         }
-
         ret = atoi(pidstr);
         if (ret == 0) {
@@ -64 +64 @@
                 goto noproc;
         }
-
 #ifndef __OS2__
         /* if we lock the file, we won't be able to read it later on OS/2 */
@@ -77 +76 @@
 
  noproc:
+#ifndef __OS2__
         SAFE_FREE(pidFile);
         close(fd);
         unlink(pidFile);
+#else
+        close(fd);
+        unlink(pidFile);
+        SAFE_FREE(pidFile);
+#endif
         return 0;
 }
@@ -113 +118 @@
 #else
         /* On OS/2, CONFIGFILE will always be different to dyn_CONFIGFILE as dyn_CONFIGFILE dynamically looks up the system ETC directory */
-        strncpy( name, program_name, sizeof( name)-1);
+        name = SMB_STRDUP(program_name);
 #endif
         if (asprintf(&pidFile, "%s/%s.pid", lp_piddir(), name) == -1) {
@@ -119 +124 @@
         }
 
-
+                DEBUG(0,("PS1\n"));
         pid = pidfile_pid(name);
+                DEBUG(0,("PS2\n"));
         if (pid != 0) {
                 DEBUG(0,("ERROR: %s is already running. File %s exists and process id %d is running.\n", 
@@ -139 +145 @@
                 exit(1);
         }
-
         memset(buf, 0, sizeof(buf));
         slprintf(buf, sizeof(buf) - 1, "%u\n", (unsigned int) sys_getpid());