From: Björn Jacke <bj@sernet.de>
Date: Wed, 24 Aug 2011 08:57:49 +0000 (+0200)
Subject: s3:winbindd: make sure we only call static_init_idmap once
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=04e4325642d029e604c31b371811fafdf2b61cf8

s3:winbindd: make sure we only call static_init_idmap once

this is a backport of 3f14d03adbda03b821210115af4fae044a9b4a3e

Fix bug #8402 - winbind log spammed with idmap messages.
---

diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c
index 7aa2853df10..2414dab224e 100644
--- a/source3/winbindd/idmap.c
+++ b/source3/winbindd/idmap.c
@@ -28,6 +28,21 @@
 
 static_decl_idmap;
 
+static void idmap_init(void)
+{
+	static bool initialized;
+
+	if (initialized) {
+		return;
+	}
+
+	DEBUG(10, ("idmap_init(): calling static_init_idmap\n"));
+
+	static_init_idmap;
+
+	initialized = true;
+}
+
 /**
  * Pointer to the backend methods. Modules register themselves here via
  * smb_register_idmap.
@@ -346,9 +361,7 @@ static struct idmap_domain *idmap_init_default_domain(TALLOC_CTX *mem_ctx)
 	char *modulename;
 	char *params;
 
-	DEBUG(10, ("idmap_init_default_domain: calling static_init_idmap\n"));
-
-	static_init_idmap;
+	idmap_init();
 
 	if (!parse_idmap_module(talloc_tos(), lp_idmap_backend(), &modulename,
 				&params)) {
@@ -546,7 +559,7 @@ static NTSTATUS idmap_alloc_init(struct idmap_alloc_context **ctx)
 	char *modulename, *params;
 	NTSTATUS ret = NT_STATUS_NO_MEMORY;;
 
-	static_init_idmap;
+	idmap_init();
 
 	if (idmap_alloc_ctx != NULL) {
 		*ctx = idmap_alloc_ctx;