ITS#5129 fix alock_close with Quick mode

[openldap] / libraries / liblutil / detach.c

diff --git a/libraries/liblutil/detach.c b/libraries/liblutil/detach.c
index c3081ef1f679195b061b28f288c8b1ebf3d5ba2f..eacd3fefec3572115af0c54d7d9f7c0f564545a1 100644 (file)
--- a/libraries/liblutil/detach.c
+++ b/libraries/liblutil/detach.c
@@ -1,4 +1,18 @@
+/* detach.c -- routines to daemonize a process */
 /* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
 /*
  * Copyright (c) 1990, 1994 Regents of the University of Michigan.
  * All rights reserved.
@@ -10,6 +24,9 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  */
+/* This work was originally developed by the University of Michigan
+ * and distributed as part of U-MICH LDAP.
+ */
 
 #include "portable.h"
 
@@ -39,7 +56,7 @@ lutil_detach( int debug, int do_close )
 
 #ifdef HAVE_SYSCONF
        nbits = sysconf( _SC_OPEN_MAX );
-#elif HAVE_GETDTABLESIZE
+#elif defined(HAVE_GETDTABLESIZE)
        nbits = getdtablesize();
 #else
        nbits = FD_SETSIZE;
@@ -53,7 +70,7 @@ lutil_detach( int debug, int do_close )
 
        if ( debug == 0 ) {
                for ( i = 0; i < 5; i++ ) {
-#if HAVE_THR
+#ifdef HAVE_THR
                        switch ( fork1() )
 #else
                        switch ( fork() )
@@ -72,35 +89,42 @@ lutil_detach( int debug, int do_close )
                        break;
                }
 
-               if ( do_close ) {
-                       if ( (sd = open( "/dev/null", O_RDWR )) != -1 ) {
-                               perror("/dev/null");
+               if ( (sd = open( "/dev/null", O_RDWR   )) == -1 &&
+                        (sd = open( "/dev/null", O_RDONLY )) == -1 &&
+                        /* Panic -- open *something* */
+                        (sd = open( "/",         O_RDONLY )) == -1    ) {
+                       perror("/dev/null");
+               } else {
+                       /* redirect stdin, stdout, stderr to /dev/null */
+                       dup2( sd, STDIN_FILENO );
+                       dup2( sd, STDOUT_FILENO );
+                       dup2( sd, STDERR_FILENO );
+
+                       switch( sd ) {
+                       default:
+                               close( sd );
+                       case STDIN_FILENO:
+                       case STDOUT_FILENO:
+                       case STDERR_FILENO:
+                               break;
                        }
+               }
 
+               if ( do_close ) {
+                       /* close everything else */
                        for ( i = 0; i < nbits; i++ ) {
-                               if( i == sd ) continue;
-
-                               close( i );
-
-                               if( i == STDIN_FILENO ||
-                                       i == STDOUT_FILENO ||
-                                       i == STDERR_FILENO )
+                               if( i != STDIN_FILENO &&
+                                       i != STDOUT_FILENO && 
+                                       i != STDERR_FILENO )
                                {
-                                       /* attach /dev/null */
-                                       dup2( sd, i );
+                                       close( i );
                                }
                        }
-
-                       if( sd != STDIN_FILENO &&
-                               sd != STDOUT_FILENO && 
-                               sd != STDERR_FILENO )
-                       {
-                               /* unless stdin, stdout, or stderr, close /dev/null */
-                               close( sd );
-                       }
                }
 
+#ifdef CHDIR_TO_ROOT
                (void) chdir( "/" );
+#endif
 
 #ifdef HAVE_SETSID
                (void) setsid();