From a61fc5b91700c55a5f8607472d86f2998b7ac4f5 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 13 Jun 2007 01:46:44 +0000 Subject: [PATCH] ITS#4911 from HEAD, move slap_op_init/destroy --- servers/slapd/init.c | 6 +++++- servers/slapd/main.c | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/servers/slapd/init.c b/servers/slapd/init.c index 9a048b64eb..2d61908629 100644 --- a/servers/slapd/init.c +++ b/servers/slapd/init.c @@ -104,6 +104,8 @@ slap_init( int mode, const char *name ) slapMode = mode; + slap_op_init(); + #ifdef SLAPD_MODULES if ( module_init() != 0 ) { ldap_debug |= 1; @@ -339,8 +341,10 @@ int slap_destroy(void) } + slap_op_destroy(); + ldap_pvt_thread_destroy(); - /* should destory the above mutex */ + /* should destroy the above mutex */ return rc; } diff --git a/servers/slapd/main.c b/servers/slapd/main.c index 7cff762abe..4dc1638382 100644 --- a/servers/slapd/main.c +++ b/servers/slapd/main.c @@ -656,7 +656,6 @@ unhandled_option:; extops_init(); lutil_passwd_init(); - slap_op_init(); rc = slap_init( serverMode, serverName ); if ( rc ) { @@ -883,8 +882,6 @@ destroy: module_kill(); #endif - slap_op_destroy(); - extops_kill(); stop: -- 2.47.2