Revert "s3:libnet: accept empty realm for AD domains when only security=domain is...

This reverts commit 234a470f198f8f09f46aaeaf58f966faccedef18.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 0a23e0d9fcf0d369ac151c0aaf76d574ec8be4c6..c98862ad554182cc4eab4e528a20e5cfbe57a8b5 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -2367,26 +2367,9 @@ static WERROR libnet_join_check_config(TALLOC_CTX *mem_ctx,
                        W_ERROR_HAVE_NO_MEMORY(wrong_conf);
                }
 
-               /*
-                * We should generate the warning for the special case when
-                * domain is AD, "security = domain" and the realm parameter is
-                * not set.
-                */
-               if (lp_security() == SEC_DOMAIN &&
-                   r->out.domain_is_ad &&
-                   !valid_realm) {
-                       libnet_join_set_error_string(mem_ctx, r,
-                               "Warning: when joining AD domains with security=domain, "
-                               "\"realm\" should be defined in the configuration (%s) "
-                               "and configuration modification was not requested",
-                               wrong_conf);
-                       return WERR_OK;
-               }
-
                libnet_join_set_error_string(mem_ctx, r,
                        "Invalid configuration (%s) and configuration modification "
                        "was not requested", wrong_conf);
-
                return WERR_CAN_NOT_COMPLETE;
        }