Attachment 13495 Details for Bug 12629 – patch for 4.6

[patch] patch for 4.6

testparm.v4.6.patch (text/plain), 1.26 KB, created by Andreas Schneider on 2017-08-23 15:20:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2017-08-23 15:20:19 UTC

Size: 1.26 KB

patch

obsolete

>From 6cafd4bf15f321a0543878029ef20ba7fa7726f7 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Fri, 18 Aug 2017 10:35:55 +0200
>Subject: [PATCH] s3:utils: Do not report an invalid range for AD DC role
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12629
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>(cherry picked from commit 95e30b081f273f2d156792577179c5220c0a10cc)
>---
> source3/utils/testparm.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
>diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
>index 3e80c39cf9d..2a7ccbbb9d0 100644
>--- a/source3/utils/testparm.c
>+++ b/source3/utils/testparm.c
>@@ -109,13 +109,15 @@ static bool lp_scan_idmap_found_domain(const char *string,
> 			return false;
> 		}
> 
>-		ok = lp_idmap_range(domname, &c->low, &c->high);
>-		if (!ok) {
>-			fprintf(stderr,
>-				"ERROR: Invalid idmap range for domain "
>-				"%s!\n\n",
>-				c->domain_name);
>-			return false;
>+		if (lp_server_role() != ROLE_ACTIVE_DIRECTORY_DC) {
>+			ok = lp_idmap_range(domname, &c->low, &c->high);
>+			if (!ok) {
>+				fprintf(stderr,
>+					"ERROR: Invalid idmap range for domain "
>+					"%s!\n\n",
>+					c->domain_name);
>+				return false;
>+			}
> 		}
> 
> 		d->count++;
>-- 
>2.14.1
>

Flags:

jra: review+

Actions: View

Attachments on bug 12629: 13493 | 13495