[PATCH] testparm should not print and idmap error for an AD DC

Jeremy Allison jra at samba.org
Tue Aug 22 21:31:06 UTC 2017


On Fri, Aug 18, 2017 at 10:52:59AM +0200, Andreas Schneider via samba-technical wrote:
> Hi,
> 
> the attached fix addresses bug #12629
> 
> 
> Review and push appreciated!

LGTM. Pushed, thanks !

> 
> 
> 	Andreas
> 
> -- 
> Andreas Schneider                   GPG-ID: CC014E3D
> Samba Team                             asn at samba.org
> www.samba.org

> From 73bc1386a6eca11d9f92052eaf0221d4c29b3ebc Mon Sep 17 00:00:00 2001
> From: Andreas Schneider <asn at 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 at samba.org>
> ---
>  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 9589201d790..a53eea5b8cc 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.0
> 




More information about the samba-technical mailing list