[SCM] Samba Shared Repository - branch master updated

[Kamen Mazdrashki]

The branch, master has been updated
       via  1e8876a... s4/repl_meta_data: remove duplicated (and commented out) log
       via  12bc68d... s4/ndr: Fix tuncating of constant to a 'long' type
      from  e637124... s4:lib/registry/ldb.c - add a missing brace

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


- Log -----------------------------------------------------------------
commit 1e8876a4f1b49a614bc478ae68b067e8cf6aec62
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Mon Jun 28 20:46:39 2010 +0300

    s4/repl_meta_data: remove duplicated (and commented out) log

commit 12bc68d4d0d62c72c3a2b86a38c20238b6e387d7
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Mon Jun 28 20:43:11 2010 +0300

    s4/ndr: Fix tuncating of constant to a 'long' type

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/repl_meta_data.c |    6 ------
 source4/torture/ndr/drsblobs.c                  |    4 ++--
 2 files changed, 2 insertions(+), 8 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 98a3c16..1e4d5ac 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -2895,12 +2895,6 @@ static int replmd_replicated_apply_merge(struct replmd_replicated_request *ar)
 			DEBUG(4,("replmd_replicated_request rename %s => %s\n",
 				  ldb_dn_get_linearized(ar->search_msg->dn),
 				  ldb_dn_get_linearized(msg->dn)));
-/*
-			ldb_debug(ldb, LDB_DEBUG_TRACE,
-				  "replmd_replicated_request rename %s => %s\n",
-				  ldb_dn_get_linearized(ar->search_msg->dn),
-				  ldb_dn_get_linearized(msg->dn));
-*/
 			/* pass rename to the next module
 			 * so it doesn't appear as an originating update */
 			ret = dsdb_module_rename(ar->module,
diff --git a/source4/torture/ndr/drsblobs.c b/source4/torture/ndr/drsblobs.c
index 926c757..689762a 100644
--- a/source4/torture/ndr/drsblobs.c
+++ b/source4/torture/ndr/drsblobs.c
@@ -41,13 +41,13 @@ static bool forest_trust_info_check_out(struct torture_context *tctx,
 	torture_assert_int_equal(tctx, r->count, 2, "count");
 	torture_assert_int_equal(tctx, r->records[0].record_size, 0x00000018, "record size");
 	torture_assert_int_equal(tctx, r->records[0].record.flags, 0, "record flags");
-	torture_assert_u64_equal(tctx, r->records[0].record.timestamp, 0x9BD5AF0001CACA3E, "record timestamp");
+	torture_assert_u64_equal(tctx, r->records[0].record.timestamp, INT64_C(0x9BD5AF0001CACA3E), "record timestamp");
 	torture_assert_int_equal(tctx, r->records[0].record.type, FOREST_TRUST_TOP_LEVEL_NAME, "record type");
 	torture_assert_int_equal(tctx, r->records[0].record.data.name.size, 7, "record name size");
 	torture_assert_str_equal(tctx, r->records[0].record.data.name.string, "f2.test", "record name string");
 	torture_assert_int_equal(tctx, r->records[1].record_size, 0x0000003a, "record size");
 	torture_assert_int_equal(tctx, r->records[1].record.flags, 0, "record flags");
-	torture_assert_u64_equal(tctx, r->records[1].record.timestamp, 0x9BD5AF0001CACA3E, "record timestamp");
+	torture_assert_u64_equal(tctx, r->records[1].record.timestamp, INT64_C(0x9BD5AF0001CACA3E), "record timestamp");
 	torture_assert_int_equal(tctx, r->records[1].record.type, FOREST_TRUST_DOMAIN_INFO, "record type");
 	torture_assert_int_equal(tctx, r->records[1].record.data.info.sid_size, 0x00000018, "record info sid_size");
 	torture_assert_sid_equal(tctx, &r->records[1].record.data.info.sid, dom_sid_parse_talloc(tctx, "S-1-5-21-677661288-1956808876-2402106903"), "record info sid");


-- 
Samba Shared Repository