svn commit: samba r3137 - branches/SAMBA_3_0/source/sam trunk/source/sam

[gd at samba.org]

Author: gd
Date: 2004-10-22 16:19:31 +0000 (Fri, 22 Oct 2004)
New Revision: 3137

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=3137&nolog=1

Log:
Do not simply ignore failing idmap-module init for remotemaps.
(in preparation of adding idmap_rid)

Guenther

Modified:
   branches/SAMBA_3_0/source/sam/idmap.c
   trunk/source/sam/idmap.c


Changeset:
Modified: branches/SAMBA_3_0/source/sam/idmap.c
===================================================================
--- branches/SAMBA_3_0/source/sam/idmap.c	2004-10-22 10:52:57 UTC (rev 3136)
+++ branches/SAMBA_3_0/source/sam/idmap.c	2004-10-22 16:19:31 UTC (rev 3137)
@@ -134,7 +134,10 @@
 		if((remote_map = get_methods(rem_backend, False)) ||
 		    (NT_STATUS_IS_OK(smb_probe_module("idmap", rem_backend)) && 
 		    (remote_map = get_methods(rem_backend, False)))) {
-			remote_map->init(params);
+			if (!NT_STATUS_IS_OK(remote_map->init(params))) {
+				DEBUG(0, ("idmap_init: failed to initialize remote backend!\n"));
+				return False;
+			}
 		} else {
 			DEBUG(0, ("idmap_init: could not load remote backend '%s'\n", rem_backend));
 			SAFE_FREE(rem_backend);

Modified: trunk/source/sam/idmap.c
===================================================================
--- trunk/source/sam/idmap.c	2004-10-22 10:52:57 UTC (rev 3136)
+++ trunk/source/sam/idmap.c	2004-10-22 16:19:31 UTC (rev 3137)
@@ -134,7 +134,10 @@
 		if((remote_map = get_methods(rem_backend, False)) ||
 		    (NT_STATUS_IS_OK(smb_probe_module("idmap", rem_backend)) && 
 		    (remote_map = get_methods(rem_backend, False)))) {
-			remote_map->init(params);
+			if (!NT_STATUS_IS_OK(remote_map->init(params))) {
+				DEBUG(0, ("idmap_init: failed to initialize remote backend!\n"));
+				return False;
+			}
 		} else {
 			DEBUG(0, ("idmap_init: could not load remote backend '%s'\n", rem_backend));
 			SAFE_FREE(rem_backend);