Added calls to new module_init() and module_kill() routines.

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index db833db299995e9d9b9e914d41863f6332b3ce6f..eb2561e09915a30216b9c54a9a62481052a135bf 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -359,6 +359,14 @@ int main( int argc, char **argv )
        }
 #endif
 
+#ifdef SLAPD_MODULES
+       if ( module_init() != 0 ) {
+               rc = 1;
+               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 17 );
+               goto destroy;
+       }
+#endif
+
        if ( slap_init( serverMode, serverName ) != 0 ) {
                rc = 1;
                SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 18 );
@@ -452,6 +460,10 @@ destroy:
        /* remember an error during destroy */
        rc |= slap_destroy();
 
+#ifdef SLAPD_MODULES
+       module_kill();
+#endif
+
 stop:
 #ifdef HAVE_NT_EVENT_LOG
        LogSlapdStoppedEvent( NTservice );