[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  f2d67af tdb: Fix undefined prototype warnings
       via  1beb4bc tdb: Fix 
 in error messages
      from  94f11e9 s3-net: Fix rpc_service_list_internal() null pointer passing.

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


- Log -----------------------------------------------------------------
commit f2d67af7bc0b316f54d6cc1a44d07f1b24244378
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Dec 14 22:49:05 2012 +0100

    tdb: Fix undefined prototype warnings
    
    These functions are deliberately left without prototypes according to
    3fdeaa399, but without prototypes we get warnings.
    
    Reviewed-by: Rusty Russell <rusty at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Mon Jan  7 11:20:19 CET 2013 on sn-devel-104

commit 1beb4bc9d12fb124935e9e4710f48ad616dacc60
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Dec 26 21:42:14 2012 +0100

    tdb: Fix \n in error messages
    
    Reviewed-by: Rusty Russell <rusty at samba.org>

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

Summary of changes:
 lib/tdb/common/lock.c      |    2 ++
 lib/tdb/tools/tdbtorture.c |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/common/lock.c b/lib/tdb/common/lock.c
index 7155a9f..b530c6e 100644
--- a/lib/tdb/common/lock.c
+++ b/lib/tdb/common/lock.c
@@ -883,12 +883,14 @@ void tdb_release_transaction_locks(struct tdb_context *tdb)
 /* Following functions are added specifically to support CTDB. */
 
 /* Don't do actual fcntl locking, just mark tdb locked */
+int tdb_transaction_write_lock_mark(struct tdb_context *tdb);
 _PUBLIC_ int tdb_transaction_write_lock_mark(struct tdb_context *tdb)
 {
 	return tdb_transaction_lock(tdb, F_WRLCK, TDB_LOCK_MARK_ONLY);
 }
 
 /* Don't do actual fcntl unlocking, just mark tdb unlocked */
+int tdb_transaction_write_lock_unmark(struct tdb_context *tdb);
 _PUBLIC_ int tdb_transaction_write_lock_unmark(struct tdb_context *tdb)
 {
 	return tdb_nest_unlock(tdb, TRANSACTION_LOCK, F_WRLCK, true);
diff --git a/lib/tdb/tools/tdbtorture.c b/lib/tdb/tools/tdbtorture.c
index 64c5043..04bbb7d 100644
--- a/lib/tdb/tools/tdbtorture.c
+++ b/lib/tdb/tools/tdbtorture.c
@@ -438,10 +438,10 @@ done:
 		db = tdb_open_ex(test_tdb, hash_size, TDB_DEFAULT,
 				 O_RDWR, 0, &log_ctx, NULL);
 		if (!db) {
-			fatal("db open failed");
+			fatal("db open failed\n");
 		}
 		if (tdb_check(db, NULL, NULL) == -1) {
-			printf("db check failed");
+			printf("db check failed\n");
 			exit(1);
 		}
 		tdb_close(db);


-- 
Samba Shared Repository