X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fback-passwd%2Finit.c;h=78c48a7a37aff62681ed714bb8732e823461cba4;hb=58afcac6898e11b5f0eb9a25560e28be68fc4a27;hp=1bb6ad284dfc5d9c0a6e99a9c8095cde519ef1e7;hpb=445b7982d708dd8f31d47adb7b9be4f9db35bef2;p=openldap diff --git a/servers/slapd/back-passwd/init.c b/servers/slapd/back-passwd/init.c index 1bb6ad284d..78c48a7a37 100644 --- a/servers/slapd/back-passwd/init.c +++ b/servers/slapd/back-passwd/init.c @@ -1,5 +1,18 @@ /* init.c - initialize passwd backend */ /* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2011 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 + * . + */ #include "portable.h" @@ -12,20 +25,8 @@ ldap_pvt_thread_mutex_t passwd_mutex; -#ifdef SLAPD_PASSWD_DYNAMIC - -int back_passwd_LTX_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_DYNAMIC */ +AttributeDescription *ad_sn; +AttributeDescription *ad_desc; int passwd_back_initialize( @@ -34,13 +35,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_config = 0; bi->bi_db_open = 0; bi->bi_db_close = 0; bi->bi_db_destroy = 0; @@ -57,13 +58,37 @@ passwd_back_initialize( bi->bi_extended = 0; - bi->bi_acl_group = 0; - bi->bi_acl_attribute = 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; } @@ -75,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 */ +