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

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/pidfile.c (modified) (3 diffs)

trunk/server/source3/lib/pidfile.c

@@ -21 +21 @@
 
 #include "includes.h"
+#include "system/filesys.h"
 
 #ifndef O_NONBLOCK
@@ -97 +98 @@
         /* 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);
@@ -154 +153 @@
                 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);
+#else
+        /* set the close on exec so that we don't leak the fd */
+        fcntl(fd, F_SETFD, FD_CLOEXEC);
 #endif
 }