Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sat, 12 Apr 2008 00:24:31 +0000 (17:24 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 12 Apr 2008 00:24:31 +0000 (17:24 -0700)
(This used to be commit 6a965e72a8650b275222548445d10b65aa61e765)

source3/locking/brlock.c

index 940dfbff8feb24f3e434bf139a5a1bdb042ca621..032aaa56b61f1bbdf389bfc27d5a3607bcc976a1 100644 (file)
@@ -749,6 +749,11 @@ NTSTATUS brl_lock(struct messaging_context *msg_ctx,
        }
 #endif
 
+#ifdef DEVELOPER
+       /* Quieten valgrind on test. */
+       memset(&lock, '\0', sizeof(lock));
+#endif
+
        lock.context.smbpid = smbpid;
        lock.context.pid = pid;
        lock.context.tid = br_lck->fsp->conn->cnum;