Changeset 454 for trunk/server/source3/lib/pidfile.c

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

File:

• trunk/server/source3/lib/pidfile.c (modified) (4 diffs)

trunk/server/source3/lib/pidfile.c

@@ -68 +68 @@
         }
 
+#ifndef __OS2__ // if we lock the file, we won't be able to read it later on OS/2
         if (fcntl_lock(fd,SMB_F_SETLK,0,1,F_RDLCK)) {
                 /* we could get the lock - it can't be a Samba process */
                 goto noproc;
         }
+#endif
 
         SAFE_FREE(pidFile);
@@ -95 +97 @@
         /* Add a suffix to the program name if this is a process with a
          * none default configuration file name. */
+
+        /* On OS/2, CONFIGFILE will always be different to dyn_CONFIGFILE 
+           as dyn_CONFIGFILE dynamically looks up the system ETC directory */    
+#ifndef __OS2__
+
         if (strcmp( CONFIGFILE, get_dyn_CONFIGFILE()) == 0) {
                 name = SMB_STRDUP(program_name);
@@ -111 +118 @@
                 }
         }
+#else
+        name = SMB_STRDUP(program_name);
+#endif
 
         if (asprintf(&pidFile_name, "%s/%s.pid", lp_piddir(), name) == -1) {
@@ -144 +154 @@
                 exit(1);
         }
+
         /* Leave pid file open & locked for the duration... */
         SAFE_FREE(name);
+#ifdef __OS2__ // If we leave the file open & locked on OS/2 - we can't read it, so close the fd
+        close(fd);
+#endif
 }