diff options
| author | Michael Adam <obnox@samba.org> | 2016-06-16 11:20:15 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2016-06-22 01:02:27 +0200 |
| commit | 7720d0475517b1f99c0a547c11f0f40b95511d41 (patch) | |
| tree | 304027056258328a56413524f53f0cf26c4597e4 /source3/libnet | |
| parent | 345cfae91910cfb62649cbf5d44483483167134f (diff) | |
| download | samba-7720d0475517b1f99c0a547c11f0f40b95511d41.tar.gz | |
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>
Diffstat (limited to 'source3/libnet')
| -rw-r--r-- | source3/libnet/libnet_join.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 0a23e0d9fcf..c98862ad554 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; } |