Changeset 738 for branches/samba-3.5.x/source3/winbindd/idmap.c

Timestamp:

Nov 12, 2012, 7:10:02 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.18

File:

• branches/samba-3.5.x/source3/winbindd/idmap.c (modified) (3 diffs)

branches/samba-3.5.x/source3/winbindd/idmap.c

@@ -28 +28 @@
 
 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;
+}
 
 /**
@@ -347 +362 @@
         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,
@@ -547 +560 @@
         NTSTATUS ret = NT_STATUS_NO_MEMORY;;
 
-        static_init_idmap;
+        idmap_init();
 
         if (idmap_alloc_ctx != NULL) {