From 98854207feb4af953226db6bbf8169e2d44cfa5b Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 2 Mar 2011 17:08:01 +0100 Subject: s3:idmap: remove special treatment of domain "*" from idmap_ldap_init. The default config via domain "*" is now treated just as the explicit domain configs. --- source3/winbindd/idmap_ldap.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'source3/winbindd/idmap_ldap.c') diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c index eb3e67de824..7edc72548ae 100644 --- a/source3/winbindd/idmap_ldap.c +++ b/source3/winbindd/idmap_ldap.c @@ -450,15 +450,11 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom, return NT_STATUS_NO_MEMORY; } - if (strequal(dom->name, "*")) { - /* more specific configuration can go here */ - } else { - config_option = talloc_asprintf(ctx, "idmap config %s", dom->name); - if ( ! config_option) { - DEBUG(0, ("Out of memory!\n")); - ret = NT_STATUS_NO_MEMORY; - goto done; - } + config_option = talloc_asprintf(ctx, "idmap config %s", dom->name); + if (!config_option) { + DEBUG(0, ("Out of memory!\n")); + ret = NT_STATUS_NO_MEMORY; + goto done; } tmp = lp_parm_const_string(-1, config_option, "ldap_url", NULL); -- cgit v1.2.1