r25059: Apply to 3.2 as well

(This used to be commit 17a7d33b3bede85d6d64ecadfa065e71739517be)

diff --git a/source3/nsswitch/idmap_ldap.c b/source3/nsswitch/idmap_ldap.c
index 1701b683308b35ff57cfa32f247d5f400ec5be03..b2aaf699d5e088eca7f4cdbd570c1203c48d0087 100644 (file)
--- a/source3/nsswitch/idmap_ldap.c
+++ b/source3/nsswitch/idmap_ldap.c
@@ -287,16 +287,9 @@ static NTSTATUS idmap_ldap_alloc_init(const char *params)
        }
        CHECK_ALLOC_DONE( idmap_alloc_ldap->url );
 
-       tmp = lp_ldap_idmap_suffix();
+       tmp = lp_parm_const_string(-1, "idmap alloc config", "ldap_base_dn", NULL);
        if ( ! tmp || ! *tmp) {
-               tmp = lp_parm_const_string(-1, "idmap alloc config", "ldap_base_dn", NULL);
-       }
-       if ( ! tmp) {
-               tmp = lp_ldap_suffix();
-               if (tmp) {
-                       DEBUG(1, ("WARNING: Trying to use the global ldap suffix(%s)\n", tmp));
-                       DEBUGADD(1, ("as suffix. This may not be what you want!\n"));
-               }
+               tmp = lp_ldap_idmap_suffix();
                if ( ! tmp) {
                        DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
                        ret = NT_STATUS_UNSUCCESSFUL;
@@ -781,21 +774,16 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom)
        }
        CHECK_ALLOC_DONE(ctx->url);
 
-       tmp = lp_ldap_idmap_suffix();
-       if ( ! tmp || ! *tmp) {
-               tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
-       }
-       if ( ! tmp) {
-               tmp = lp_ldap_suffix();
-               if (tmp) {
-                       DEBUG(1, ("WARNING: Trying to use the global ldap suffix(%s)\n", tmp));
-                       DEBUGADD(1, ("as suffix. This may not be what you want!\n"));
-               } else {
-                       DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
-                       ret = NT_STATUS_UNSUCCESSFUL;
-                       goto done;
-               }               
-       }
+        tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
+        if ( ! tmp || ! *tmp) {
+                tmp = lp_ldap_idmap_suffix();
+                if ( ! tmp) {
+                        DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
+                        ret = NT_STATUS_UNSUCCESSFUL;
+                        goto done;
+               }
+        }
+
        ctx->suffix = talloc_strdup(ctx, tmp);
        CHECK_ALLOC_DONE(ctx->suffix);