[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  7829395 dsdb: Rename a parameter
      from  6c4e3cf ctdb-packaging: Package private libraries

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


- Log -----------------------------------------------------------------
commit 782939592671b9fb2c92910c6151f2d739ca7645
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Jun 24 17:02:53 2015 +0200

    dsdb: Rename a parameter
    
    Coverity was confused by the 'seq_num' variable as an argument for the
    'local_usn' parameter, where also a 'seq_num' parameter exists. Doesn't hurt,
    and if it kills a Coverity warning, why not...
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: "Stefan (metze) Metzmacher" <metze at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Wed Jul  1 14:09:14 CEST 2015 on sn-devel-104

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 4 ++--
 1 file changed, 2 insertions(+), 2 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 4c5ced4..4ff1395 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -1837,7 +1837,7 @@ static int replmd_check_upgrade_links(struct parsed_dn *dns, uint32_t count, str
  */
 static int replmd_update_la_val(TALLOC_CTX *mem_ctx, struct ldb_val *v, struct dsdb_dn *dsdb_dn,
 				struct dsdb_dn *old_dsdb_dn, const struct GUID *invocation_id,
-				uint64_t seq_num, uint64_t local_usn, NTTIME nttime,
+				uint64_t usn, uint64_t local_usn, NTTIME nttime,
 				uint32_t version, bool deleted)
 {
 	struct ldb_dn *dn = dsdb_dn->dn;
@@ -1860,7 +1860,7 @@ static int replmd_update_la_val(TALLOC_CTX *mem_ctx, struct ldb_val *v, struct d
 	}
 	tval = data_blob_string_const(tstring);
 
-	usn_string = talloc_asprintf(mem_ctx, "%llu", (unsigned long long)seq_num);
+	usn_string = talloc_asprintf(mem_ctx, "%llu", (unsigned long long)usn);
 	if (!usn_string) {
 		return LDB_ERR_OPERATIONS_ERROR;
 	}


-- 
Samba Shared Repository