]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
idmap_ldap: Use idmap_config_const_string
authorVolker Lendecke <vl@samba.org>
Sat, 18 Mar 2017 17:38:10 +0000 (18:38 +0100)
committerMichael Adam <obnox@samba.org>
Mon, 20 Mar 2017 18:36:21 +0000 (19:36 +0100)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
source3/winbindd/idmap_ldap.c

index 0520f213ef6d0c9fefc3e3260c29b8cbd4efb7cb..a7fe17eb5ce3bd7119f5803b2bed20476f501a87 100644 (file)
@@ -64,7 +64,6 @@ struct idmap_ldap_context {
 
 static NTSTATUS get_credentials( TALLOC_CTX *mem_ctx,
                                 struct smbldap_state *ldap_state,
-                                const char *config_option,
                                 struct idmap_domain *dom,
                                 char **dn )
 {
@@ -76,7 +75,7 @@ static NTSTATUS get_credentials( TALLOC_CTX *mem_ctx,
 
        /* assume anonymous if we don't have a specified user */
 
-       tmp = lp_parm_const_string(-1, config_option, "ldap_user_dn", NULL);
+       tmp = idmap_config_const_string(dom->name, "ldap_user_dn", NULL);
 
        if ( tmp ) {
                if (!dom) {
@@ -478,7 +477,7 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom)
                goto done;
        }
 
-       ret = get_credentials( ctx, ctx->smbldap_state, config_option,
+       ret = get_credentials( ctx, ctx->smbldap_state,
                               dom, &ctx->user_dn );
        if ( !NT_STATUS_IS_OK(ret) ) {
                DEBUG(1,("idmap_ldap_db_init: Failed to get connection "