Attachment 6804 Details for Bug 8402 – proposed patch to restore the sound of silence

[patch] proposed patch to restore the sound of silence

0001-s3-winbindd-make-sure-we-only-call-static_init_idmap.patch (text/plain), 1.49 KB, created by Björn Jacke on 2011-08-25 10:19:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Jacke

Created: 2011-08-25 10:19:46 UTC

Size: 1.49 KB

patch

obsolete

>From 791c872910e551775f49f3e96fccc9e2bd420be4 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
>Date: Wed, 24 Aug 2011 10:57:49 +0200
>Subject: [PATCH] s3:winbindd: make sure we only call static_init_idmap once
>
>this is a backport of 3f14d03adbda03b821210115af4fae044a9b4a3e
>---
> source3/winbindd/idmap.c |   21 +++++++++++++++++----
> 1 files changed, 17 insertions(+), 4 deletions(-)
>
>diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c
>index 7aa2853..2414dab 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;
>-- 
>1.7.6
>

Flags:

obnox: review+

Actions: View

Attachments on bug 8402: 6804