idmap_rfc2307: Use idmap_config_const_string

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/source3/winbindd/idmap_rfc2307.c b/source3/winbindd/idmap_rfc2307.c
index 34cc5cd179f7184a786435698524f4a4bdb3c623..d59690e577f7ba20d032be2b9d03dcd3bbc08ce5 100644 (file)
--- a/source3/winbindd/idmap_rfc2307.c
+++ b/source3/winbindd/idmap_rfc2307.c
@@ -109,15 +109,15 @@ static NTSTATUS idmap_rfc2307_ads_search(struct idmap_rfc2307_context *ctx,
 }
 
 static NTSTATUS idmap_rfc2307_init_ads(struct idmap_rfc2307_context *ctx,
-                                      const char *cfg_opt)
+                                      const char *domain_name)
 {
        const char *ldap_domain;
 
        ctx->search = idmap_rfc2307_ads_search;
        ctx->check_connection = idmap_rfc2307_ads_check_connection;
 
-       ldap_domain = lp_parm_const_string(-1, cfg_opt, "ldap_domain",
-                                             NULL);
+       ldap_domain = idmap_config_const_string(domain_name, "ldap_domain",
+                                               NULL);
        if (ldap_domain) {
                ctx->ldap_domain = talloc_strdup(ctx, ldap_domain);
                if (ctx->ldap_domain == NULL) {
@@ -167,8 +167,7 @@ static bool idmap_rfc2307_get_uint32(LDAP *ldap, LDAPMessage *entry,
 }
 
 static NTSTATUS idmap_rfc2307_init_ldap(struct idmap_rfc2307_context *ctx,
-                                       struct idmap_domain *dom,
-                                       const char *config_option)
+                                       const char *domain_name)
 {
        NTSTATUS ret;
        char *url;
@@ -176,7 +175,7 @@ static NTSTATUS idmap_rfc2307_init_ldap(struct idmap_rfc2307_context *ctx,
        const char *ldap_url, *user_dn;
        TALLOC_CTX *mem_ctx = ctx;
 
-       ldap_url = lp_parm_const_string(-1, config_option, "ldap_url", NULL);
+       ldap_url = idmap_config_const_string(domain_name, "ldap_url", NULL);
        if (!ldap_url) {
                DEBUG(1, ("ERROR: missing idmap ldap url\n"));
                return NT_STATUS_UNSUCCESSFUL;
@@ -184,9 +183,9 @@ static NTSTATUS idmap_rfc2307_init_ldap(struct idmap_rfc2307_context *ctx,
 
        url = talloc_strdup(talloc_tos(), ldap_url);
 
-       user_dn = lp_parm_const_string(-1, config_option, "ldap_user_dn", NULL);
+       user_dn = idmap_config_const_string(domain_name, "ldap_user_dn", NULL);
        if (user_dn) {
-               secret = idmap_fetch_secret("ldap", dom->name, user_dn);
+               secret = idmap_fetch_secret("ldap", domain_name, user_dn);
                if (!secret) {
                        ret = NT_STATUS_ACCESS_DENIED;
                        goto done;
@@ -780,8 +779,8 @@ static NTSTATUS idmap_rfc2307_initialize(struct idmap_domain *domain)
                goto err;
        }
 
-       bind_path_user = lp_parm_const_string(-1, cfg_opt, "bind_path_user",
-                                             NULL);
+       bind_path_user = idmap_config_const_string(
+               domain->name, "bind_path_user", NULL);
        if (bind_path_user) {
                ctx->bind_path_user = talloc_strdup(ctx, bind_path_user);
                if (ctx->bind_path_user == NULL) {
@@ -793,8 +792,8 @@ static NTSTATUS idmap_rfc2307_initialize(struct idmap_domain *domain)
                goto err;
        }
 
-       bind_path_group = lp_parm_const_string(-1, cfg_opt, "bind_path_group",
-                                              NULL);
+       bind_path_group = idmap_config_const_string(
+               domain->name, "bind_path_group", NULL);
        if (bind_path_group) {
                ctx->bind_path_group = talloc_strdup(ctx, bind_path_group);
                if (ctx->bind_path_group == NULL) {
@@ -806,17 +805,18 @@ static NTSTATUS idmap_rfc2307_initialize(struct idmap_domain *domain)
                goto err;
        }
 
-       ldap_server = lp_parm_const_string(-1, cfg_opt, "ldap_server", NULL);
+       ldap_server = idmap_config_const_string(
+               domain->name, "ldap_server", NULL);
        if (!ldap_server) {
                status = NT_STATUS_INVALID_PARAMETER;
                goto err;
        }
 
        if (strcmp(ldap_server, "stand-alone") == 0) {
-               status = idmap_rfc2307_init_ldap(ctx, domain, cfg_opt);
+               status = idmap_rfc2307_init_ldap(ctx, domain->name);
 
        } else if (strcmp(ldap_server, "ad") == 0) {
-               status = idmap_rfc2307_init_ads(ctx, cfg_opt);
+               status = idmap_rfc2307_init_ads(ctx, domain->name);
 
        } else {
                status = NT_STATUS_INVALID_PARAMETER;
@@ -826,7 +826,7 @@ static NTSTATUS idmap_rfc2307_initialize(struct idmap_domain *domain)
                goto err;
        }
 
-       realm = lp_parm_const_string(-1, cfg_opt, "realm", NULL);
+       realm = idmap_config_const_string(domain->name, "realm", NULL);
        if (realm) {
                ctx->realm = talloc_strdup(ctx, realm);
                if (ctx->realm == NULL) {