Change 'attribute' directive to 'attributetype'

[openldap] / servers / slurpd / main.c

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index c2a71484faf40b8c50498d846e7178ad74047e62..2aa86e75c9bb3789fd0c5d5a7198c741bfd46399 100644 (file)
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
@@ -87,14 +88,10 @@ main(
     }
 
     /*
-     * Detach from the controlling terminal, if debug level = 0,
-     * and if not in one-shot mode.
+     * Detach from the controlling terminal
+     * unless the -d flag is given or in one-shot mode.
      */
-#ifdef LDAP_DEBUG
-    if (( ldap_debug == 0 )  && !sglob->one_shot_mode )
-#else /* LDAP_DEBUG */
-    if ( !sglob->one_shot_mode )
-#endif /* LDAP_DEBUG */
+    if ( ! (sglob->no_detach || sglob->one_shot_mode) )
        lutil_detach( 0, 0 );
 
     /*