summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-03-02 17:08:01 +0100
committerMichael Adam <obnox@samba.org>2011-03-22 22:49:56 +0100
commit98854207feb4af953226db6bbf8169e2d44cfa5b (patch)
tree2a4f71d51c7b0d1b94ff66f9f426664801608df7
parent7511f080b459a5477362eeb6a326ed73e38a1b11 (diff)
downloadsamba-98854207feb4af953226db6bbf8169e2d44cfa5b.tar.gz
samba-98854207feb4af953226db6bbf8169e2d44cfa5b.tar.bz2
samba-98854207feb4af953226db6bbf8169e2d44cfa5b.zip
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.
-rw-r--r--source3/winbindd/idmap_ldap.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index eb3e67de82..7edc72548a 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);