replace detach.c with lutil_detach()

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index b9d74e8b206217ba6c326e5dabdf84b0b1ceb104..502ed69624ddd8b58b247b033ce3ff9fed2c13d5 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -8,14 +8,14 @@ SRCS  = main.c daemon.c connection.c search.c filter.c add.c charray.c \
                dn.c compare.c modify.c delete.c modrdn.c ch_malloc.c \
                value.c ava.c bind.c unbind.c abandon.c filterentry.c \
                phonetic.c acl.c str2filter.c aclparse.c init.c \
-               detach.c repl.c lock.c \
+               repl.c lock.c \
                suffixalias.c schema.c schemaparse.c monitor.c configinfo.c
 OBJS   = main.o daemon.o connection.o search.o filter.o add.o charray.o \
                attr.o entry.o config.o backend.o result.o operation.o \
                dn.o compare.o modify.o delete.o modrdn.o ch_malloc.o \
                value.o ava.o bind.o unbind.o abandon.o filterentry.o \
                phonetic.o acl.o str2filter.o aclparse.o init.o \
-               detach.o repl.o lock.o \
+               repl.o lock.o \
                suffixalias.o schema.o schemaparse.o monitor.o configinfo.o
 
 LDAP_INCDIR= ../../include

diff --git a/servers/slapd/detach.c b/servers/slapd/detach.c
deleted file mode 100644 (file)
index e20c839..0000000
--- a/servers/slapd/detach.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1990, 1994 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-#include "portable.h"
-
-#include <stdio.h>
-
-#include <ac/signal.h>
-#include <ac/unistd.h>
-
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-
-detach()
-{
-       int             i, sd, nbits;
-#ifdef LDAP_DEBUG
-       extern int      ldap_debug;
-#endif
-
-#ifdef HAVE_SYSCONF
-       nbits = sysconf( _SC_OPEN_MAX );
-#elif HAVE_GETDTABLESIZE
-       nbits = getdtablesize();
-#else
-       nbits = FD_SETSIZE
-#endif 
-
-#ifdef FD_SETSIZE
-       if ( nbits > FD_SETSIZE ) {
-               nbits = FD_SETSIZE;
-       }
-#endif /* FD_SETSIZE */
-
-#ifdef LDAP_DEBUG
-       if ( ldap_debug == 0 ) {
-#endif
-               for ( i = 0; i < 5; i++ ) {
-#if defined( HAVE_THR )
-                       switch ( fork1() ) {
-#else
-                       switch ( fork() ) {
-#endif
-                       case -1:
-                               sleep( 5 );
-                               continue;
-
-                       case 0:
-                               break;
-
-                       default:
-                               _exit( 0 );
-                       }
-                       break;
-               }
-
-/*
-               for ( i = 3; i < nbits; i++ )
-                       close( i );
-*/
-
-               (void) chdir( "/" );
-
-               if ( (sd = open( "/dev/null", O_RDWR )) == -1 ) {
-                       perror( "/dev/null" );
-                       exit( 1 );
-               }
-               if ( isatty( 0 ) )
-                       (void) dup2( sd, 0 );
-               if ( isatty( 1 ) )
-                       (void) dup2( sd, 1 );
-               if ( isatty(2) )
-                       (void) dup2( sd, 2 );
-               close( sd );
-
-#ifdef HAVE_SETSID
-               setsid();
-#else /* HAVE_SETSID */
-               if ( (sd = open( "/dev/tty", O_RDWR )) != -1 ) {
-                       (void) ioctl( sd, TIOCNOTTY, NULL );
-                       (void) close( sd );
-               }
-#endif /* HAVE_SETSID */
-#ifdef LDAP_DEBUG
-       } 
-#endif
-
-       (void) SIGNAL( SIGPIPE, SIG_IGN );
-}

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 95bdf7130149aa0f11776e91d02877cde6d9ebf6..4f48fdaf0e3987b18216b57d328aa75777b479fd 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -162,7 +162,11 @@ main( argc, argv )
        if ( ! inetd ) {
                /* pre-open config file before detach in case it is a relative path */
                fp = fopen( configfile, "r" );
-               detach();
+#ifdef LDAP_DEBUG
+               lutil_detach( ldap_debug, 0 );
+#else
+               lutil_detach( 0, 0 );
+#endif
        }
 #ifdef LOG_LOCAL4
        openlog( myname, OPENLOG_OPTIONS, LOG_LOCAL4 );