Fix memory leak if duplicate attr name in at_insert

[openldap] / servers / ldapd / main.c

diff --git a/servers/ldapd/main.c b/servers/ldapd/main.c
index 7f819084bb6673f65d5a899acde729c61534f7d4..764f4e9c094e8267595f4baebe4541d97d77dc92 100644 (file)
--- a/servers/ldapd/main.c
+++ b/servers/ldapd/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990-1996 Regents of the University of Michigan.
  * All rights reserved.
@@ -106,6 +107,7 @@ main( int argc, char **argv )
        int                     udps;
 #endif
        int                     myport = LDAP_PORT;
+       int                     no_detach = 0;
        int                     i, pid, socktype;
        char                    *myname;
        fd_set                  readfds;
@@ -150,13 +152,15 @@ main( int argc, char **argv )
                        dsapargc = 3;
                        break;
 
-               case 'd':       /* turn on debugging */
+               case 'd':       /* set debug level and 'do not detach' flag */
+                       no_detach = 1;
 #ifdef LDAP_DEBUG
                        ldap_debug = atoi( optarg );
                        if ( ldap_debug & LDAP_DEBUG_PACKETS )
                                ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &ldap_debug );
 #else
-                       fprintf( stderr, "Not compiled with -DLDAP_DEBUG!\n" );
+                       if ( atoi( optarg ) != 0 )
+                               fputs( "Not compiled with -DLDAP_DEBUG!\n", stderr );
 #endif
                        break;
 
@@ -261,11 +265,7 @@ main( int argc, char **argv )
                setproctitle( "initializing" );
 #endif
 #ifndef VMS
-#  ifdef LDAP_DEBUG
-               lutil_detach( ldap_debug, 1 );
-#  else
-               lutil_detach( 0, 1 );
-#  endif
+               lutil_detach( no_detach, 1 );
 #endif
                (void) SIGNAL( SIGCHLD, wait4child );
                (void) SIGNAL( SIGINT, log_and_exit );
@@ -406,7 +406,7 @@ main( int argc, char **argv )
 
 #ifdef HAVE_TCPD
                if ( !hosts_ctl("ldapd", (hp == NULL) ? "unknown" : hp->h_name,
-                       inet_ntoa( from.sin_addr ), STRING_UNKNOWN ) {
+                       inet_ntoa( from.sin_addr ), STRING_UNKNOWN) ) {
 
                        Debug( LDAP_DEBUG_ARGS, "connection from %s (%s) denied.\n",
                                (hp == NULL) ? "unknown" : hp->h_name,