Attachment 12196 Details for Bug 11977 – patch for v4-3-test, cherry-picked from master

[patch] patch for v4-3-test, cherry-picked from master

bug-11977.v4-3-test.patches (text/plain), 3.94 KB, created by Michael Adam on 2016-06-22 08:35:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Adam

Created: 2016-06-22 08:35:50 UTC

Size: 3.94 KB

patch

obsolete

>From 6f542f47fc613d5100b48aa771316f865b54e8cb Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Wed, 15 Jun 2016 16:04:29 +0200
>Subject: [PATCH 1/2] s3-libnet: Print error string even on successfuly
> completion of libnetjoin.
>
>Sometimes useful information should be printed to the users.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11977
>
>Guenther
>
>Signed-off-by: Guenther Deschner <gd@samba.org>
>(cherry picked from commit 632faa87610b3afca3f8d3e9f3f46ee6b87f362a)
>---
> source3/utils/net_ads.c |  5 +++++
> source3/utils/net_rpc.c | 10 ++++++++++
> 2 files changed, 15 insertions(+)
>
>diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
>index 28553fc..0548a43 100644
>--- a/source3/utils/net_ads.c
>+++ b/source3/utils/net_ads.c
>@@ -1587,6 +1587,11 @@ int net_ads_join(struct net_context *c, int argc, const char **argv)
> 			r->out.netbios_domain_name);
> 	}
> 
>+	/* print out informative error string in case there is one */
>+	if (r->out.error_string != NULL) {
>+		d_printf("%s\n", r->out.error_string);
>+	}
>+
> 	/*
> 	 * We try doing the dns update (if it was compiled in).
> 	 * If the dns update fails, we still consider the join
>diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
>index 1de08c4..c184815 100644
>--- a/source3/utils/net_rpc.c
>+++ b/source3/utils/net_rpc.c
>@@ -428,6 +428,11 @@ static int net_rpc_oldjoin(struct net_context *c, int argc, const char **argv)
> 			r->out.netbios_domain_name);
> 	}
> 
>+	/* print out informative error string in case there is one */
>+	if (r->out.error_string != NULL) {
>+		d_printf("%s\n", r->out.error_string);
>+	}
>+
> 	TALLOC_FREE(mem_ctx);
> 
> 	return 0;
>@@ -607,6 +612,11 @@ static int net_rpc_join_newstyle(struct net_context *c, int argc, const char **a
> 			r->out.netbios_domain_name);
> 	}
> 
>+	/* print out informative error string in case there is one */
>+	if (r->out.error_string != NULL) {
>+		d_printf("%s\n", r->out.error_string);
>+	}
>+
> 	TALLOC_FREE(mem_ctx);
> 
> 	return 0;
>-- 
>2.5.5
>
>
>From 28d78636eef2dcb0755cde55206cf123efd309d8 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Wed, 15 Jun 2016 23:03:32 +0200
>Subject: [PATCH 2/2] libnet: ignore realm setting for domain security joins to
> AD domains if 'winbind rpc only = true'
>
>Inspired by initial patch from Matt Rogers @ RedHat.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11977
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Guenther Deschner <gd@samba.org>
>
>Autobuild-User(master): Michael Adam <obnox@samba.org>
>Autobuild-Date(master): Wed Jun 22 05:05:47 CEST 2016 on sn-devel-144
>
>(cherry picked from commit e29d8f108cd090706dc3f54282f5c33ec30df899)
>---
> source3/libnet/libnet_join.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
>diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
>index 3e58b18..1db92b2 100644
>--- a/source3/libnet/libnet_join.c
>+++ b/source3/libnet/libnet_join.c
>@@ -2128,6 +2128,7 @@ static WERROR libnet_join_check_config(TALLOC_CTX *mem_ctx,
> 	bool valid_security = false;
> 	bool valid_workgroup = false;
> 	bool valid_realm = false;
>+	bool ignored_realm = false;
> 
> 	/* check if configuration is already set correctly */
> 
>@@ -2147,11 +2148,26 @@ static WERROR libnet_join_check_config(TALLOC_CTX *mem_ctx,
> 			valid_realm = strequal(lp_realm(), r->out.dns_domain_name);
> 			switch (lp_security()) {
> 			case SEC_DOMAIN:
>+				if (!valid_realm && lp_winbind_rpc_only()) {
>+					valid_realm = true;
>+					ignored_realm = true;
>+				}
> 			case SEC_ADS:
> 				valid_security = true;
> 			}
> 
> 			if (valid_workgroup && valid_realm && valid_security) {
>+				if (ignored_realm && !r->in.modify_config)
>+				{
>+					libnet_join_set_error_string(mem_ctx, r,
>+						"Warning: ignoring realm when "
>+						"joining AD domain with "
>+						"'security=domain' and "
>+						"'winbind rpc only = yes'. "
>+						"(realm set to '%s', "
>+						"should be '%s').", lp_realm(),
>+						r->out.dns_domain_name);
>+				}
> 				/* nothing to be done */
> 				return WERR_OK;
> 			}
>-- 
>2.5.5
>

Flags:

obnox: review+
gd: review+

Actions: View

Attachments on bug 11977: 12183 | 12184 | 12195 | 12196