Fix ldaps / TLS processing...

[openldap] / libraries / liblutil / detach.c

diff --git a/libraries/liblutil/detach.c b/libraries/liblutil/detach.c
index c3081ef1f679195b061b28f288c8b1ebf3d5ba2f..022c2dbd787e825e58a2de47ba124e095ec0233e 100644 (file)
--- a/libraries/liblutil/detach.c
+++ b/libraries/liblutil/detach.c
@@ -72,35 +72,37 @@ 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 ) {
+                       perror("/dev/null");
+               }
 
-                       for ( i = 0; i < nbits; i++ ) {
-                               if( i == sd ) continue;
+               /* close stdin, stdout, stderr */
+               close( STDIN_FILENO );
+               close( STDOUT_FILENO );
+               close( STDERR_FILENO );
+
+               /* redirect stdin, stdout, stderr to /dev/null */
+               dup2( sd, STDIN_FILENO );
+               dup2( sd, STDOUT_FILENO );
+               dup2( sd, STDERR_FILENO );
 
-                               close( i );
+               close( sd );
 
-                               if( i == STDIN_FILENO ||
-                                       i == STDOUT_FILENO ||
-                                       i == STDERR_FILENO )
+               if ( do_close ) {
+                       /* close everything else */
+                       for ( i = 0; i < nbits; i++ ) {
+                               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();