s3:idmap: remove special treatment of domain "*" from idmap_ldap_init.
authorMichael Adam <obnox@samba.org>
Wed, 2 Mar 2011 16:08:01 +0000 (17:08 +0100)
committerMichael Adam <obnox@samba.org>
Tue, 22 Mar 2011 21:49:56 +0000 (22:49 +0100)
The default config via domain "*" is now treated just as the explicit
domain configs.

source3/winbindd/idmap_ldap.c

index eb3e67de824f937a8f1f9206fbca70a9f87e420d..7edc72548aee01b677d7296aa10effeded30eaab 100644 (file)
@@ -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);