don't leak matchedDN

[openldap] / servers / slurpd / main.c

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index 1e4a53ffcb2d322734d56b1477f043015a3e1301..ccd75e7ed0398f6227fea53a7c2c87289fb394e4 100644 (file)
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -110,26 +110,14 @@ int main( int argc, char **argv )
                if ( i != NULL ) 
                {
                        ldap_debug = *i;
-#ifdef NEW_LOGGING
-                       lutil_log_initialize( argc, argv );
-                       LDAP_LOG( SLURPD, INFO, 
-                               "main: new debug level from registry is: %d\n", 
-                               ldap_debug, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY, "new debug level from registry is: %d\n", ldap_debug, 0, 0 );
-#endif
                }
 
                newConfigFile = (char*)lutil_getRegParam( regService, "ConfigFile" );
                if ( newConfigFile != NULL ) 
                {
                        sglob->slapd_configfile = newConfigFile;
-#ifdef NEW_LOGGING
-                       LDAP_LOG( SLURPD, INFO, 
-                               "main: new config file from registry is: %s\n", sglob->slapd_configfile, 0, 0 );
-#else
                        Debug ( LDAP_DEBUG_ANY, "new config file from registry is: %s\n", sglob->slapd_configfile, 0, 0 );
-#endif
 
                }
        }
@@ -152,11 +140,7 @@ int main( int argc, char **argv )
                }
     }
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( SLURPD, INFO, "%s\n", Versionstr, 0, 0 );
-#else
        Debug ( LDAP_DEBUG_ANY, "%s\n", Versionstr, 0, 0 );
-#endif
     
     /*
      * Read slapd config file and initialize Re (per-replica) structs.
@@ -172,10 +156,20 @@ int main( int argc, char **argv )
 
 #ifdef HAVE_TLS
        if( ldap_pvt_tls_init() || ldap_pvt_tls_init_def_ctx() ) {
-               fprintf( stderr, "TLS Initialization failed.\n" );
-               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
-               rc = 1;
-               goto stop;
+               rc = 0;
+               /* See if we actually need TLS */
+               for ( i=0; i < sglob->num_replicas; i++ ) {
+                       if ( sglob->replicas[i]->ri_tls || ( sglob->replicas[i]->ri_uri &&
+                               !strncmp( sglob->replicas[i]->ri_uri, "ldaps:", 6 ))) {
+                               rc = 1;
+                               break;
+                       }
+               }
+               if ( rc ) {
+                       fprintf( stderr, "TLS Initialization failed.\n" );
+                       SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
+                       goto stop;
+               }
        }
 #endif
 
@@ -265,13 +259,8 @@ int main( int argc, char **argv )
     if ( ldap_pvt_thread_create( &(sglob->fm_tid),
                0, fm, (void *) NULL ) != 0 )
        {
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, ERR,
-               "main: file manager ldap_pvt_thread_create failed\n" , 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_ANY, "file manager ldap_pvt_thread_create failed\n",
                0, 0, 0 );
-#endif
        SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 );
        rc = 1;
        goto stop;
@@ -325,11 +314,7 @@ stop:
     ldap_pvt_tls_destroy();
 #endif
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, RESULTS, "main: slurpd terminated\n", 0, 0, 0 );
-#else
     Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 );
-#endif
 
     if ( slurpd_pid_file != NULL ) {
        unlink( slurpd_pid_file );