Do not return pointers into BerElement we do not own

[openldap] / servers / slapd / main.c

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 40a036ce8928174ac48e5ae7c1836c922dd9d8b4..0b399288905f5b2d22bf27196778181dc5f8f817 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -1,10 +1,9 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 #include "portable.h"
-#include "slapi_common.h"
 
 #include <stdio.h>
 
@@ -17,12 +16,14 @@
 
 #include "ldap_pvt.h"
 
-
 #include "slap.h"
-#include "slapi.h"
 #include "lutil.h"
 #include "ldif.h"
 
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
 #ifdef LDAP_SIGCHLD
 static RETSIGTYPE wait4child( int sig );
 #endif
@@ -31,15 +32,10 @@ static RETSIGTYPE wait4child( int sig );
 #define MAIN_RETURN(x) return
 static struct sockaddr_in      bind_addr;
 
-void CommenceStartupProcessing( LPCTSTR serverName,
-                                                          void(*stopper)(int));
-void ReportSlapdShutdownComplete( void );
-void *getRegParam( char *svc, char *value );
-
 #define SERVICE_EXIT( e, n )   do { \
        if ( is_NT_Service ) { \
-               SLAPDServiceStatus.dwWin32ExitCode                              = (e); \
-               SLAPDServiceStatus.dwServiceSpecificExitCode    = (n); \
+               lutil_ServiceStatus.dwWin32ExitCode                             = (e); \
+               lutil_ServiceStatus.dwServiceSpecificExitCode   = (n); \
        } \
 } while ( 0 )
 
@@ -48,11 +44,6 @@ void *getRegParam( char *svc, char *value );
 #define MAIN_RETURN(x) return(x)
 #endif
 
-#ifdef HAVE_NT_EVENT_LOG
-void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, char *urls );
-void LogSlapdStoppedEvent( char *svc );
-#endif
-
 /*
  * when more than one slapd is running on one machine, each one might have
  * it's own LOCAL for syslogging and must have its own pid/args files
@@ -84,7 +75,7 @@ static STRDISP        syslog_types[] = {
        { "LOCAL5", sizeof("LOCAL5"), LOG_LOCAL5 },
        { "LOCAL6", sizeof("LOCAL6"), LOG_LOCAL6 },
        { "LOCAL7", sizeof("LOCAL7"), LOG_LOCAL7 },
-       { NULL }
+       { NULL, 0, 0 }
 };
 
 static int   cnvt_str2int( char *, STRDISP_P, int );
@@ -160,7 +151,6 @@ int main( int argc, char **argv )
        }
 #endif
 
-
 #ifdef HAVE_NT_SERVICE_MANAGER
        {
                int *i;
@@ -170,12 +160,12 @@ int main( int argc, char **argv )
 
                if ( is_NT_Service ) {
                        serverName = argv[0];
-                       CommenceStartupProcessing( serverName, slap_sig_shutdown );
+                       lutil_CommenceStartupProcessing( serverName, slap_sig_shutdown );
                        if ( strcmp(serverName, SERVICE_NAME) )
                            regService = serverName;
                }
 
-               i = (int*)getRegParam( regService, "DebugLevel" );
+               i = (int*)lutil_getRegParam( regService, "DebugLevel" );
                if ( i != NULL ) 
                {
                        slap_debug = *i;
@@ -189,7 +179,7 @@ int main( int argc, char **argv )
 #endif
                }
 
-               newUrls = (char *) getRegParam(regService, "Urls");
+               newUrls = (char *) lutil_getRegParam(regService, "Urls");
                if (newUrls)
                {
                    if (urls)
@@ -206,7 +196,7 @@ int main( int argc, char **argv )
 
                }
 
-               newConfigFile = (char*)getRegParam( regService, "ConfigFile" );
+               newConfigFile = (char*)lutil_getRegParam( regService, "ConfigFile" );
                if ( newConfigFile != NULL ) 
                {
                        configfile = newConfigFile;
@@ -328,7 +318,6 @@ int main( int argc, char **argv )
        Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 );
 #endif
 
-
        if( serverName == NULL ) {
                if ( (serverName = strrchr( argv[0], *LDAP_DIRSEP )) == NULL ) {
                        serverName = argv[0];
@@ -371,6 +360,8 @@ int main( int argc, char **argv )
 #endif
 
        extops_init();
+       lutil_passwd_init();
+       slap_op_init();
 
 #ifdef SLAPD_MODULES
        if ( module_init() != 0 ) {
@@ -398,6 +389,18 @@ int main( int argc, char **argv )
                goto destroy;
        }
 
+       if ( slap_controls_init( ) != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, CRIT, "main: controls initialization error\n", 0, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY,
+                   "controls initialization error\n",
+                   0, 0, 0 );
+#endif
+
+               goto destroy;
+       }
+
 #ifdef HAVE_TLS
        /* Library defaults to full certificate checking. This is correct when
         * a client is verifying a server because all servers should have a
@@ -525,37 +528,44 @@ int main( int argc, char **argv )
                goto shutdown;
        }
 
-       {
-               FILE *fp;
-
 #ifdef NEW_LOGGING
-               LDAP_LOG( SLAPD, INFO, "main: slapd starting.\n", 0, 0, 0 );
+       LDAP_LOG( SLAPD, INFO, "main: slapd starting.\n", 0, 0, 0 );
 #else
-               Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
 #endif
 
 
-               if (( slapd_pid_file != NULL ) &&
-                       (( fp = fopen( slapd_pid_file, "w" )) != NULL ))
-               {
+       if ( slapd_pid_file != NULL ) {
+               FILE *fp = fopen( slapd_pid_file, "w" );
+
+               if( fp != NULL ) {
                        fprintf( fp, "%d\n", (int) getpid() );
                        fclose( fp );
+
+               } else {
+                       free(slapd_pid_file);
+                       slapd_pid_file = NULL;
                }
+       }
 
-               if (( slapd_args_file != NULL ) &&
-                       (( fp = fopen( slapd_args_file, "w" )) != NULL ))
-               {
+       if ( slapd_args_file != NULL ) {
+               FILE *fp = fopen( slapd_args_file, "w" );
+
+               if( fp != NULL ) {
                        for ( i = 0; i < g_argc; i++ ) {
                                fprintf( fp, "%s ", g_argv[i] );
                        }
                        fprintf( fp, "\n" );
                        fclose( fp );
+               } else {
+                       free(slapd_args_file);
+                       slapd_args_file = NULL;
                }
        }
 
 #ifdef HAVE_NT_EVENT_LOG
        if (is_NT_Service)
-       LogSlapdStartedEvent( serverName, slap_debug, configfile, urls );
+       lutil_LogStartedEvent( serverName, slap_debug, configfile, urls );
 #endif
 
        rc = slapd_daemon();
@@ -578,12 +588,14 @@ destroy:
        module_kill();
 #endif
 
+       slap_op_destroy();
+
        extops_kill();
 
 stop:
 #ifdef HAVE_NT_EVENT_LOG
        if (is_NT_Service)
-       LogSlapdStoppedEvent( serverName );
+       lutil_LogStoppedEvent( serverName );
 #endif
 
 #ifdef NEW_LOGGING
@@ -594,7 +606,7 @@ stop:
 
 
 #ifdef HAVE_NT_SERVICE_MANAGER
-       ReportSlapdShutdownComplete();
+       lutil_ReportShutdownComplete();
 #endif
 
 #ifdef LOG_DEBUG
@@ -602,12 +614,23 @@ stop:
 #endif
        slapd_daemon_destroy();
 
+       controls_destroy();
+
        schema_destroy();
 
+       lutil_passwd_destroy();
+
 #ifdef HAVE_TLS
        ldap_pvt_tls_destroy();
 #endif
 
+       if ( slapd_pid_file != NULL ) {
+               unlink( slapd_pid_file );
+       }
+       if ( slapd_args_file != NULL ) {
+               unlink( slapd_args_file );
+       }
+
        config_destroy();
 
 #ifdef CSRIMALLOC