Attachment 10154 Details for Bug 10737 – Fix patch picked from master

[patch] Fix patch picked from master

0001-s3-idmap-don-t-log-missing-range-config-if-range-che.v4-1-test.patch (text/plain), 1.42 KB, created by Michael Adam on 2014-07-28 11:53:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Adam

Created: 2014-07-28 11:53:37 UTC

Size: 1.42 KB

patch

obsolete

>From 53b06575febbf3d31f9226ecad0e42c40e40783c Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Sun, 20 Jul 2014 11:49:37 +0200
>Subject: [PATCH] s3:idmap: don't log missing range config if range checking
> not requested
>
>idmap_init_domain() is called with check_range == false from
>idmap_passdb_domain(). In this case, we usually don't have an
>idmap range at all, and we don't want to level 1 debug
>messages complaining about the fact are irritating at least.
>
>This patch removes the debug in the case of check_range == false.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10737
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>(cherry picked from commit 3c6ec8908a697ac95536b35d242ccd64e524a0a5)
>---
> source3/winbindd/idmap.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c
>index 97a34d4..c3c88ea 100644
>--- a/source3/winbindd/idmap.c
>+++ b/source3/winbindd/idmap.c
>@@ -197,9 +197,9 @@ static struct idmap_domain *idmap_init_domain(TALLOC_CTX *mem_ctx,
> 
> 	range = lp_parm_const_string(-1, config_option, "range", NULL);
> 	if (range == NULL) {
>-		DEBUG(1, ("idmap range not specified for domain %s\n",
>-			  result->name));
> 		if (check_range) {
>+			DEBUG(1, ("idmap range not specified for domain %s\n",
>+				  result->name));
> 			goto fail;
> 		}
> 	} else if (sscanf(range, "%u - %u", &result->low_id,
>-- 
>1.9.1
>

Flags:

obnox: review+
vl: review+

Actions: View

Attachments on bug 10737: 10154