[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  e2c7e5c... tdb: Fix bug 7248, avoid the nanosleep dependency
      from  12f97c0... Fix valgrind error when running under share level security. plaintext_password is a data blob with a data pointer pointing to an allocation of length zero.

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


- Log -----------------------------------------------------------------
commit e2c7e5c4f72565fe49265d5b036531926ea1ac92
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Mar 14 20:07:58 2010 +0100

    tdb: Fix bug 7248, avoid the nanosleep dependency

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

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 5ee6991..eda79f8 100644
--- a/lib/tdb/tools/tdbtorture.c
+++ b/lib/tdb/tools/tdbtorture.c
@@ -355,12 +355,12 @@ int main(int argc, char * const *argv)
 
 		pid = waitpid(-1, &status, kill_random ? WNOHANG : 0);
 		if (pid == 0) {
-			struct timespec ts;
+			struct timeval tv;
 
 			/* Sleep for 1/10 second. */
-			ts.tv_sec = 0;
-			ts.tv_nsec = 100000000;
-			nanosleep(&ts, NULL);
+			tv.tv_sec = 0;
+			tv.tv_usec = 100000;
+			select(0, NULL, NULL, NULL, &tv);
 
 			/* Kill someone. */
 			kill(pids[random() % num_procs], SIGUSR1);


-- 
Samba Shared Repository