ITS#4780 plug leak

[openldap] / servers / slapd / back-passwd / init.c

diff --git a/servers/slapd/back-passwd/init.c b/servers/slapd/back-passwd/init.c
index 1ef59c31e6d02cb9f97ec90b2e88b4df879d69d2..0b61bc9f40b60fc1f77c13319607591a5b17adcf 100644 (file)
--- a/servers/slapd/back-passwd/init.c
+++ b/servers/slapd/back-passwd/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,20 +25,8 @@
 
 ldap_pvt_thread_mutex_t passwd_mutex;
 
-#if SLAPD_PASSWD == SLAPD_MOD_DYNAMIC
-
-int init_module(int argc, char *argv[]) {
-    BackendInfo bi;
-
-    memset( &bi, '\0', sizeof(bi) );
-    bi.bi_type = "passwd";
-    bi.bi_init = passwd_back_initialize;
-
-    backend_add(&bi);
-    return 0;
-}
-
-#endif /* SLAPD_PASSWD */
+AttributeDescription *ad_sn;
+AttributeDescription *ad_desc;
 
 int
 passwd_back_initialize(
@@ -47,7 +35,7 @@ passwd_back_initialize(
 {
        ldap_pvt_thread_mutex_init( &passwd_mutex );
 
-       bi->bi_open = 0;
+       bi->bi_open = passwd_back_open;
        bi->bi_config = 0;
        bi->bi_close = 0;
        bi->bi_destroy = passwd_back_destroy;
@@ -78,6 +66,32 @@ passwd_back_initialize(
        return 0;
 }
 
+int
+passwd_back_open(
+       BackendInfo *bi
+)
+{
+       const char      *text;
+       int             rc;
+
+       rc = slap_str2ad( "sn", &ad_sn, &text );
+       if ( rc != LDAP_SUCCESS ) {
+               Debug( LDAP_DEBUG_ANY, "passwd_back_open: "
+                       "slap_str2ad(\"%s\") returned %d: %s\n",
+                       "sn", rc, text );
+               return -1;
+       }
+       rc = slap_str2ad( "description", &ad_desc, &text );
+       if ( rc != LDAP_SUCCESS ) {
+               Debug( LDAP_DEBUG_ANY, "passwd_back_open: "
+                       "slap_str2ad(\"%s\") returned %d: %s\n",
+                       "description", rc, text );
+               return -1;
+       }
+
+       return 0;
+}
+
 int
 passwd_back_destroy(
        BackendInfo *bi
@@ -86,3 +100,11 @@ passwd_back_destroy(
        ldap_pvt_thread_mutex_destroy( &passwd_mutex );
        return 0;
 }
+
+#if SLAPD_PASSWD == SLAPD_MOD_DYNAMIC
+
+/* conditionally define the init_module() function */
+SLAP_BACKEND_INIT_MODULE( passwd )
+
+#endif /* SLAPD_PASSWD == SLAPD_MOD_DYNAMIC */
+