ITS#2993 fix prev commit

[openldap] / libraries / liblutil / detach.c

diff --git a/libraries/liblutil/detach.c b/libraries/liblutil/detach.c
index 5d27febf9c525e1a114bd54f16d3d0174eb90a60..058059a5c0abcb4b33fa2360b24abd6ca79f1d03 100644 (file)
--- a/libraries/liblutil/detach.c
+++ b/libraries/liblutil/detach.c
@@ -1,3 +1,18 @@
+/* detach.c -- routines to daemonize a process */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 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.
@@ -9,18 +24,28 @@
  * 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"
 
 #include <stdio.h>
 
+#include <ac/stdlib.h>
 #include <ac/signal.h>
+#include <ac/socket.h>
 #include <ac/unistd.h>
 
 #include <sys/stat.h>
 #include <fcntl.h>
+
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
 
 #include "lutil.h"
 
@@ -59,36 +84,59 @@ lutil_detach( int debug, int do_close )
                                break;
 
                        default:
-                               _exit( 0 );
+                               _exit( EXIT_SUCCESS );
                        }
                        break;
                }
 
-               if ( do_close )
-                       for ( i = 3; i < nbits; i++ )
-                               close( i );
-
-               (void) chdir( "/" );
+               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 ( (sd = open( "/dev/null", O_RDWR )) == -1 ) {
-                       perror( "/dev/null" );
-                       exit( 1 );
+               if ( do_close ) {
+                       /* close everything else */
+                       for ( i = 0; i < nbits; i++ ) {
+                               if( i != STDIN_FILENO &&
+                                       i != STDOUT_FILENO && 
+                                       i != STDERR_FILENO )
+                               {
+                                       close( i );
+                               }
+                       }
                }
-               for ( i = 0;  i < 3;  i++ )
-                       if ( sd != i && isatty( i ) )
-                               (void) dup2( sd, i );
-               if ( sd > 2 )
-                       close( sd );
+
+#ifdef CHDIR_TO_ROOT
+               (void) chdir( "/" );
+#endif
 
 #ifdef HAVE_SETSID
                (void) setsid();
-#else /* HAVE_SETSID */
+#elif TIOCNOTTY
                if ( (sd = open( "/dev/tty", O_RDWR )) != -1 ) {
                        (void) ioctl( sd, TIOCNOTTY, NULL );
                        (void) close( sd );
                }
-#endif /* HAVE_SETSID */
+#endif
        } 
 
+#ifdef SIGPIPE
        (void) SIGNAL( SIGPIPE, SIG_IGN );
+#endif
 }