From: Michael Adam <obnox@samba.org>
Date: Thu, 16 Jun 2016 09:20:15 +0000 (+0200)
Subject: Revert "s3:libnet: accept empty realm for AD domains when only security=domain is... 
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=7720d0475517b1f99c0a547c11f0f40b95511d41;p=metze%2Fsamba%2Fwip.git

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

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 0a23e0d9fcf0..c98862ad5541 100644
--- 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;
 	}