[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2975-g2a085d5

Herb Lewis herb at samba.org
Thu Sep 4 20:59:23 GMT 2008


The branch, v3-2-test has been updated
       via  2a085d5343ab954e1bd60c11033506dc7c9040e3 (commit)
      from  edd234e7a22dab105256f90df36d86f168dcea4c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 2a085d5343ab954e1bd60c11033506dc7c9040e3
Author: Herb Lewis <herb at samba.org>
Date:   Thu Sep 4 13:58:06 2008 -0700

    get rid of unneeded argument for get_methods

-----------------------------------------------------------------------

Summary of changes:
 source/winbindd/idmap.c |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/idmap.c b/source/winbindd/idmap.c
index a1c2b1f..850aeb4 100644
--- a/source/winbindd/idmap.c
+++ b/source/winbindd/idmap.c
@@ -75,12 +75,11 @@ static struct idmap_alloc_context *idmap_alloc_ctx = NULL;
 		goto done; \
 	} } while(0)
 
-static struct idmap_methods *get_methods(struct idmap_backend *be,
-					 const char *name)
+static struct idmap_methods *get_methods(const char *name)
 {
 	struct idmap_backend *b;
 
-	for (b = be; b; b = b->next) {
+	for (b = backends; b; b = b->next) {
 		if (strequal(b->name, name)) {
 			return b->methods;
 		}
@@ -140,7 +139,7 @@ NTSTATUS smb_register_idmap(int version, const char *name,
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
-	test = get_methods(backends, name);
+	test = get_methods(name);
 	if (test) {
 		DEBUG(0,("Idmap module %s already registered!\n", name));
 		return NT_STATUS_OBJECT_NAME_COLLISION;
@@ -454,13 +453,12 @@ NTSTATUS idmap_init(void)
 		IDMAP_CHECK_ALLOC(parm_backend);
 
 		/* get the backend methods for this domain */
-		dom->methods = get_methods(backends, parm_backend);
+		dom->methods = get_methods(parm_backend);
 
 		if ( ! dom->methods) {
 			ret = smb_probe_module("idmap", parm_backend);
 			if (NT_STATUS_IS_OK(ret)) {
-				dom->methods = get_methods(backends,
-							   parm_backend);
+				dom->methods = get_methods(parm_backend);
 			}
 		}
 		if ( ! dom->methods) {
@@ -541,13 +539,11 @@ NTSTATUS idmap_init(void)
 		dom->readonly = False;
 
 		/* get the backend methods for this domain */
-		dom->methods = get_methods(backends, compat_backend);
-
+		dom->methods = get_methods(compat_backend); 
 		if ( ! dom->methods) {
 			ret = smb_probe_module("idmap", compat_backend);
 			if (NT_STATUS_IS_OK(ret)) {
-				dom->methods = get_methods(backends,
-							   compat_backend);
+				dom->methods = get_methods(compat_backend);
 			}
 		}
 		if ( ! dom->methods) {
@@ -606,8 +602,8 @@ NTSTATUS idmap_init(void)
 		dom->default_domain = False;
 		dom->readonly = True;
 
-		/* get the backend methods for passdb */
-		dom->methods = get_methods(backends, "nss");
+		/* get the backend methods for nss */
+		dom->methods = get_methods("nss");
 
 		/* (the nss module is always statically linked) */
 		if ( ! dom->methods) {
@@ -663,7 +659,7 @@ NTSTATUS idmap_init(void)
 	dom->readonly = True;
 
 	/* get the backend methods for passdb */
-	dom->methods = get_methods(backends, "passdb");
+	dom->methods = get_methods("passdb");
 
 	/* (the passdb module is always statically linked) */
 	if ( ! dom->methods) {


-- 
Samba Shared Repository


More information about the samba-cvs mailing list