[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
       via  4f58041 tdbtorture: print details when run with -n 1
      from  3dfca72 dsdb: Also redact the clearTextPassword input-only attribute

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


- Log -----------------------------------------------------------------
commit 4f58041639168caee379f8f5b936a30f1a71f0a6
Author: David Disseldorp <ddiss at samba.org>
Date:   Fri Aug 15 14:47:49 2014 +0200

    tdbtorture: print details when run with -n 1
    
    Currently tdbtorture prints the test details (processes, loops, etc.)
    from the first forked child process.
    When run with -n 1 (one process), the test is run from within the
    parent and no details are printed. This change ensures that they are.
    
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Mon Aug 18 13:26:32 CEST 2014 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/lib/tdb/tools/tdbtorture.c b/lib/tdb/tools/tdbtorture.c
index 3e26f65..9278688 100644
--- a/lib/tdb/tools/tdbtorture.c
+++ b/lib/tdb/tools/tdbtorture.c
@@ -350,6 +350,10 @@ int main(int argc, char * const *argv)
 		seed = (getpid() + time(NULL)) & 0x7FFFFFFF;
 	}
 
+	printf("Testing with %d processes, %d loops, %d hash_size, seed=%d%s\n",
+	       num_procs, num_loops, hash_size, seed,
+	       (always_transaction ? " (all within transactions)" : ""));
+
 	if (num_procs == 1 && !kill_random) {
 		/* Don't fork for this case, makes debugging easier. */
 		error_count = run_child(test_tdb, 0, seed, num_loops, 0);
@@ -376,10 +380,6 @@ int main(int argc, char * const *argv)
 	for (i=0;i<num_procs;i++) {
 		if ((pids[i]=fork()) == 0) {
 			close(pfds[0]);
-			if (i == 0) {
-				printf("Testing with %d processes, %d loops, %d hash_size, seed=%d%s\n",
-				       num_procs, num_loops, hash_size, seed, always_transaction ? " (all within transactions)" : "");
-			}
 			exit(run_child(test_tdb, i, seed, num_loops, 0));
 		}
 	}


-- 
Samba Shared Repository