[SCM] Samba Shared Repository - branch master updated

[Kamen Mazdrashki]

The branch, master has been updated
       via  585e9a0 s4-repl_meta_data: replmd_update_is_newer() should not return true if metadata stamps are equal
       via  0ce93ad s4-repl_meta_data: Print out what is wrong when we fail to modify object
       via  0aa118f s4-repl_meta_data: We should not use USNs in metadata comparisons
      from  6ee39a2 s3-torture: fix uninitialized status code.

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


- Log -----------------------------------------------------------------
commit 585e9a0ab0e0673f1222a4e26d94c90fb6e88331
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Fri Jan 21 22:51:05 2011 +0200

    s4-repl_meta_data: replmd_update_is_newer() should not return true if metadata stamps are equal
    
    Autobuild-User: Kamen Mazdrashki <kamenim at samba.org>
    Autobuild-Date: Sat Jan 22 12:22:30 CET 2011 on sn-devel-104

commit 0ce93ad2bc91fd7cbe2f71d00a323a827b9457b1
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Fri Jan 21 02:39:23 2011 +0200

    s4-repl_meta_data: Print out what is wrong when we fail to modify object

commit 0aa118f22bb2e810e5c530c743c48dcb7bde92cc
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Fri Jan 21 02:38:25 2011 +0200

    s4-repl_meta_data: We should not use USNs in metadata comparisons
    
    If object is changed by same DC, then version should be incremented

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/repl_meta_data.c |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 2cc52b9..87327e5 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -372,6 +372,7 @@ static int replmd_op_callback(struct ldb_request *req, struct ldb_reply *ares)
 	controls = ldb_controls_except_specified(ares->controls, ares, partition_ctrl);
 
 	if (ares->error != LDB_SUCCESS) {
+		DEBUG(0,("%s failure. Error is: %s\n", __FUNCTION__, ldb_strerror(ares->error)));
 		return ldb_module_done(ac->req, controls,
 					ares->response, ares->error);
 	}
@@ -2946,23 +2947,16 @@ static bool replmd_update_is_newer(const struct GUID *current_invocation_id,
 				   const struct GUID *update_invocation_id,
 				   uint32_t current_version,
 				   uint32_t update_version,
-				   uint32_t current_usn,
-				   uint32_t update_usn,
 				   NTTIME current_change_time,
 				   NTTIME update_change_time)
 {
-	if (GUID_compare(update_invocation_id, current_invocation_id) == 0) {
-		if (update_usn != current_usn) {
-			return update_usn >= current_usn;
-		}
-	}
 	if (update_version != current_version) {
-		return update_version >= current_version;
+		return update_version > current_version;
 	}
 	if (update_change_time != current_change_time) {
-		return update_change_time >= current_change_time;
+		return update_change_time > current_change_time;
 	}
-	return GUID_compare(update_invocation_id, current_invocation_id) >= 0;
+	return GUID_compare(update_invocation_id, current_invocation_id) > 0;
 }
 
 static bool replmd_replPropertyMetaData1_is_newer(struct replPropertyMetaData1 *cur_m,
@@ -2972,8 +2966,6 @@ static bool replmd_replPropertyMetaData1_is_newer(struct replPropertyMetaData1 *
 				      &new_m->originating_invocation_id,
 				      cur_m->version,
 				      new_m->version,
-				      cur_m->originating_usn,
-				      new_m->originating_usn,
 				      cur_m->originating_change_time,
 				      new_m->originating_change_time);
 }
@@ -4004,8 +3996,6 @@ linked_attributes[0]:
 					    &la->meta_data.originating_invocation_id,
 					    version,
 					    la->meta_data.version,
-					    originating_usn,
-					    la->meta_data.originating_usn,
 					    change_time,
 					    la->meta_data.originating_change_time)) {
 			DEBUG(3,("Discarding older DRS linked attribute update to %s on %s from %s\n",


-- 
Samba Shared Repository