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 f627ad1ad958261407b507895b78abd6486d304d..0b399288905f5b2d22bf27196778181dc5f8f817 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -32,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 )
 
@@ -49,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
@@ -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;
@@ -370,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 ) {
@@ -573,7 +565,7 @@ int main( int argc, char **argv )
 
 #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();
@@ -596,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
@@ -612,7 +606,7 @@ stop:
 
 
 #ifdef HAVE_NT_SERVICE_MANAGER
-       ReportSlapdShutdownComplete();
+       lutil_ReportShutdownComplete();
 #endif
 
 #ifdef LOG_DEBUG
@@ -624,6 +618,8 @@ stop:
 
        schema_destroy();
 
+       lutil_passwd_destroy();
+
 #ifdef HAVE_TLS
        ldap_pvt_tls_destroy();
 #endif