[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  8e5f8d7 s4:samldb LDB module - remove "type" parameter of "samldb_fill_object"
      from  2db1987 idtree: fix right shift of signed ints, crash on large ids on AIX

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8e5f8d71f22f0c102f46339427069d0571597ebf
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Wed Oct 6 11:37:28 2010 +0200

    s4:samldb LDB module - remove "type" parameter of "samldb_fill_object"
    
    It's a bit redundant given that we have the "type" variable on "ac".
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Wed Oct  6 10:20:45 UTC 2010 on sn-devel-104

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/samldb.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index f3a9e08..c67f2d0 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -612,7 +612,7 @@ static bool check_rodc_critical_attribute(struct ldb_message *msg)
 }
 
 
-static int samldb_fill_object(struct samldb_ctx *ac, const char *type)
+static int samldb_fill_object(struct samldb_ctx *ac)
 {
 	struct ldb_context *ldb;
 	struct loadparm_context *lp_ctx;
@@ -624,7 +624,6 @@ static int samldb_fill_object(struct samldb_ctx *ac, const char *type)
 	ldb = ldb_module_get_ctx(ac->module);
 
 	/* Add informations for the different account types */
-	ac->type = type;
 	if (strcmp(ac->type, "user") == 0) {
 		ret = samdb_find_or_add_attribute(ldb, ac->msg,
 			"userAccountControl", "546");
@@ -1103,12 +1102,14 @@ static int samldb_add(struct ldb_module *module, struct ldb_request *req)
 
 	if (samdb_find_attribute(ldb, ac->msg,
 				 "objectclass", "user") != NULL) {
-		return samldb_fill_object(ac, "user");
+		ac->type = "user";
+		return samldb_fill_object(ac);
 	}
 
 	if (samdb_find_attribute(ldb, ac->msg,
 				 "objectclass", "group") != NULL) {
-		return samldb_fill_object(ac, "group");
+		ac->type = "group";
+		return samldb_fill_object(ac);
 	}
 
 	/* perhaps a foreignSecurityPrincipal? */
@@ -1126,7 +1127,8 @@ static int samldb_add(struct ldb_module *module, struct ldb_request *req)
 			return ret;
 		}
 
-		return samldb_fill_object(ac, "classSchema");
+		ac->type = "classSchema";
+		return samldb_fill_object(ac);
 	}
 
 	if (samdb_find_attribute(ldb, ac->msg,
@@ -1137,7 +1139,8 @@ static int samldb_add(struct ldb_module *module, struct ldb_request *req)
 			return ret;
 		}
 
-		return samldb_fill_object(ac, "attributeSchema");
+		ac->type = "attributeSchema";
+		return samldb_fill_object(ac);
 	}
 
 	talloc_free(ac);


-- 
Samba Shared Repository