[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  49b23fe... Fix comments on new test. Jeremy
      from  e58f880... Add local (or NFS) lock test to smbtorture. Checks that local locks conflict with CIFS locks (see bug 6868). Jeremy.

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


- Log -----------------------------------------------------------------
commit 49b23fe248ae6582ad1c12c52c2cd7a658964c0c
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Oct 20 17:41:27 2009 -0700

    Fix comments on new test.
    Jeremy

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

Summary of changes:
 source3/torture/torture.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 7b92bea..ca499a9 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -2,6 +2,7 @@
    Unix SMB/CIFS implementation.
    SMB torture tester
    Copyright (C) Andrew Tridgell 1997-1998
+   Copyright (C) Jeremy Allison 2009
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -2179,9 +2180,8 @@ fail:
 /*
  * This test is designed to be run in conjunction with
  * external NFS or POSIX locks taken in the filesystem.
- * It will block until the lock is taken (and is designed
- * to do so). Check out scripts/tests/test_nfslock_s3.sh.
- * JRA.
+ * It checks that the smbd server will block until the
+ * lock is released and then acquire it. JRA.
  */
 
 static bool got_alarm;


-- 
Samba Shared Repository