Merge remote branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-passwd/init.c b/servers/slapd/back-passwd/init.c
index 34e486846c0792357e397613d5e0278d6749383a..b3ed1d47164694b59d8c06acd4ac22d9bf3dafcd 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-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -22,24 +22,13 @@
 
 #include "slap.h"
 #include "back-passwd.h"
-#include "external.h"
 
 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;
+AttributeDescription *ad_sn;
+AttributeDescription *ad_desc;
 
-    backend_add(&bi);
-    return 0;
-}
-
-#endif /* SLAPD_PASSWD */
+static BI_db_init passwd_back_db_init;
 
 int
 passwd_back_initialize(
@@ -48,13 +37,13 @@ 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;
 
-       bi->bi_db_init = 0;
-       bi->bi_db_config = passwd_back_db_config;
+       bi->bi_db_init = passwd_back_db_init;
+       bi->bi_db_config = 0;
        bi->bi_db_open = 0;
        bi->bi_db_close = 0;
        bi->bi_db_destroy = 0;
@@ -76,6 +65,32 @@ passwd_back_initialize(
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = 0;
 
+       return passwd_back_init_cf( bi );
+}
+
+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;
 }
 
@@ -87,3 +102,21 @@ passwd_back_destroy(
        ldap_pvt_thread_mutex_destroy( &passwd_mutex );
        return 0;
 }
+
+static int
+passwd_back_db_init(
+       Backend *be,
+       struct config_reply_s *cr
+)
+{
+       be->be_cf_ocs = be->bd_info->bi_cf_ocs;
+       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 */
+