[SCM] Samba Shared Repository - branch master updated

[Kamen Mazdrashki]

The branch, master has been updated
       via  af5649d s4-repl_meta_data: Print function name when we can't find attribute in Schema cache
       via  05e77f5 s4-linked_attributes: Give more info where an error occured
       via  be0a2a6 s4-repl_meta_data: Remove duplicated check
       via  be27a9d s4-schema_load: Strip a pointless check
      from  654e010 lib/util:tests/time.c - "test_timestring" - fix it on Solaris

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


- Log -----------------------------------------------------------------
commit af5649d5f87e0c8b85eb950a253a4e65cca8ccd0
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Mon Dec 6 00:17:43 2010 +0200

    s4-repl_meta_data: Print function name when we can't find attribute in Schema cache
    
    Same error message is printed by linked_attributes.c module
    and it was really hard to tell where the error occurred
    
    Autobuild-User: Kamen Mazdrashki <kamenim at samba.org>
    Autobuild-Date: Mon Dec  6 00:05:59 CET 2010 on sn-devel-104

commit 05e77f52d701b5f8b87de7c89eda6f4076722e24
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Sun Dec 5 17:19:44 2010 +0200

    s4-linked_attributes: Give more info where an error occured
    
    We have exact same error messages at different locations
    and it is little bit hard to tell where the error came from
    from the log.

commit be0a2a68914aa9cecb9d32361750b2f50af6cc06
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Sun Dec 5 17:11:28 2010 +0200

    s4-repl_meta_data: Remove duplicated check

commit be27a9dc42cb950443a77e44fdfbd4e5019893aa
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Sat Dec 4 23:03:21 2010 +0200

    s4-schema_load: Strip a pointless check
    
    If *schema is NULL, then dsdb_schema_from_ldb_results()
    call should have failed

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/linked_attributes.c |   11 ++++++++---
 source4/dsdb/samdb/ldb_modules/repl_meta_data.c    |    5 ++---
 source4/dsdb/samdb/ldb_modules/schema_load.c       |    4 +---
 3 files changed, 11 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/linked_attributes.c b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
index 6045525..ebbc7c6 100644
--- a/source4/dsdb/samdb/ldb_modules/linked_attributes.c
+++ b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
@@ -223,7 +223,9 @@ static int linked_attributes_add(struct ldb_module *module, struct ldb_request *
 			= dsdb_attribute_by_lDAPDisplayName(ac->schema, el->name);
 		if (!schema_attr) {
 			ldb_asprintf_errstring(ldb,
-					       "attribute %s is not a valid attribute in schema", el->name);
+					       "%s: attribute %s is not a valid attribute in schema",
+					       __FUNCTION__,
+					       el->name);
 			return LDB_ERR_OBJECT_CLASS_VIOLATION;
 		}
 		/* We have a valid attribute, now find out if it is a forward link */
@@ -325,7 +327,8 @@ static int la_mod_search_callback(struct ldb_request *req, struct ldb_reply *are
 			schema_attr = dsdb_attribute_by_lDAPDisplayName(ac->schema, rc->el[i].name);
 			if (!schema_attr) {
 				ldb_asprintf_errstring(ldb,
-					"attribute %s is not a valid attribute in schema",
+					"%s: attribute %s is not a valid attribute in schema",
+					__FUNCTION__,
 					rc->el[i].name);
 				talloc_free(ares);
 				return ldb_module_done(ac->req, NULL, NULL,
@@ -454,7 +457,9 @@ static int linked_attributes_modify(struct ldb_module *module, struct ldb_reques
 			= dsdb_attribute_by_lDAPDisplayName(ac->schema, el->name);
 		if (!schema_attr) {
 			ldb_asprintf_errstring(ldb,
-					       "attribute %s is not a valid attribute in schema", el->name);
+					       "%s: attribute %s is not a valid attribute in schema",
+					       __FUNCTION__,
+					       el->name);
 			return LDB_ERR_OBJECT_CLASS_VIOLATION;
 		}
 		/* We have a valid attribute, now find out if it is a forward link
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 3a27e7b..2bdb7af 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -2081,7 +2081,8 @@ static int replmd_modify_handle_linked_attribs(struct ldb_module *module,
 			= dsdb_attribute_by_lDAPDisplayName(schema, el->name);
 		if (!schema_attr) {
 			ldb_asprintf_errstring(ldb,
-					       "attribute %s is not a valid attribute in schema", el->name);
+					       "%s: attribute %s is not a valid attribute in schema",
+					       __FUNCTION__, el->name);
 			return LDB_ERR_OBJECT_CLASS_VIOLATION;
 		}
 		if (schema_attr->linkID == 0) {
@@ -3329,8 +3330,6 @@ static int replmd_replicated_apply_next(struct replmd_replicated_request *ar)
 		return ret;
 	}
 
-	if (ret != LDB_SUCCESS) return replmd_replicated_request_error(ar, ret);
-
 	return ldb_next_request(ar->module, search_req);
 }
 
diff --git a/source4/dsdb/samdb/ldb_modules/schema_load.c b/source4/dsdb/samdb/ldb_modules/schema_load.c
index ddc3b3f..4b6fc46 100644
--- a/source4/dsdb/samdb/ldb_modules/schema_load.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_load.c
@@ -239,9 +239,7 @@ static int dsdb_schema_from_db(struct ldb_module *module, struct ldb_dn *schema_
 	/* "dsdb_set_schema()" steals schema into the ldb_context */
 	ret = dsdb_set_schema(ldb, (*schema));
 
-	if (*schema != NULL) {
-		(*schema)->refresh_in_progress = false;
-	}
+	(*schema)->refresh_in_progress = false;
 
 	if (ret != LDB_SUCCESS) {
 		ldb_debug_set(ldb, LDB_DEBUG_FATAL,


-- 
Samba Shared Repository