Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

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

diff --git a/servers/slapd/back-passwd/init.c b/servers/slapd/back-passwd/init.c
index ea41064bf34a3e07ffea04353da771aadcc1fe57..4fc06a657b2f2a618719ee732b2de2e23c902425 100644 (file)
--- a/servers/slapd/back-passwd/init.c
+++ b/servers/slapd/back-passwd/init.c
@@ -1,4 +1,18 @@
 /* init.c - initialize passwd backend */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2012 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
 
 #include "portable.h"
 
@@ -7,33 +21,28 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "external.h"
+#include "back-passwd.h"
 
-#ifdef SLAPD_PASSWD_DYNAMIC
-#include <gmodule.h>
+ldap_pvt_thread_mutex_t passwd_mutex;
 
-G_MODULE_EXPORT void init_module(int argc, char *argv[]) {
-   BackendInfo bi;
+AttributeDescription *ad_sn;
+AttributeDescription *ad_desc;
 
-   bi.bi_type = "passwd";
-   bi.bi_init = passwd_back_initialize;
-
-   backend_add(&bi);
-}
-
-#endif /* SLAPD_PASSWD_DYNAMIC */
+static BI_db_init passwd_back_db_init;
 
 int
 passwd_back_initialize(
     BackendInfo        *bi
 )
 {
-       bi->bi_open = 0;
+       ldap_pvt_thread_mutex_init( &passwd_mutex );
+
+       bi->bi_open = passwd_back_open;
        bi->bi_config = 0;
        bi->bi_close = 0;
-       bi->bi_destroy = 0;
+       bi->bi_destroy = passwd_back_destroy;
 
-       bi->bi_db_init = 0;
+       bi->bi_db_init = passwd_back_db_init;
        bi->bi_db_config = 0;
        bi->bi_db_open = 0;
        bi->bi_db_close = 0;
@@ -49,10 +58,65 @@ passwd_back_initialize(
        bi->bi_op_delete = 0;
        bi->bi_op_abandon = 0;
 
-       bi->bi_acl_group = 0;
+       bi->bi_extended = 0;
+
+       bi->bi_chk_referrals = 0;
 
        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;
 }
+
+int
+passwd_back_destroy(
+       BackendInfo *bi
+)
+{
+       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 */
+