[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  ba6dda1 Add delete-ln test now we can correctly delete hardlinks.
       via  eec50b2 Change "security=share" to downgrade to SMB1 from SMB2, rather than trying to fake it.
      from  5dd63c6 libwbclient: bump the libwbclient SOVER 0 -> 1 due to ABI changes

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


- Log -----------------------------------------------------------------
commit ba6dda1934b5440398600812e320528f00673bc2
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jan 27 15:37:25 2011 -0800

    Add delete-ln test now we can correctly delete hardlinks.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Fri Jan 28 01:24:19 CET 2011 on sn-devel-104

commit eec50b21f6d74de4e69a2c649799452736a494b1
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jan 27 15:00:14 2011 -0800

    Change "security=share" to downgrade to SMB1 from SMB2, rather than trying to fake it.

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

Summary of changes:
 source3/param/loadparm.c                   |   13 ++++++++++++-
 source3/script/tests/test_smbtorture_s3.sh |    2 +-
 source3/smbd/smb2_server.c                 |    8 --------
 3 files changed, 13 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index b45e045..3abebf4 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5789,7 +5789,18 @@ FN_GLOBAL_INTEGER(lp_passwordlevel, &Globals.pwordlevel)
 FN_GLOBAL_INTEGER(lp_usernamelevel, &Globals.unamelevel)
 FN_GLOBAL_INTEGER(lp_deadtime, &Globals.deadtime)
 FN_GLOBAL_BOOL(lp_getwd_cache, &Globals.getwd_cache)
-FN_GLOBAL_INTEGER(lp_maxprotocol, &Globals.maxprotocol)
+FN_GLOBAL_INTEGER(_lp_maxprotocol, &Globals.maxprotocol)
+int lp_maxprotocol(void)
+{
+	int ret = _lp_maxprotocol();
+	if ((ret == PROTOCOL_SMB2) && (lp_security() == SEC_SHARE)) {
+		DEBUG(2,("WARNING!!: \"security = share\" is incompatible "
+			"with the SMB2 protocol. Resetting to SMB1.\n" ));
+			lp_do_parameter(-1, "max protocol", "NT1");
+		return PROTOCOL_NT1;
+	}
+	return ret;
+}
 FN_GLOBAL_INTEGER(lp_minprotocol, &Globals.minprotocol)
 FN_GLOBAL_INTEGER(lp_security, &Globals.security)
 FN_GLOBAL_LIST(lp_auth_methods, &Globals.AuthMethods)
diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index 2a26131..466855d 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -29,7 +29,7 @@ tests="FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7 LOCK9"
 tests="$tests UNLINK BROWSE ATTR TRANS2 TORTURE "
 tests="$tests OPLOCK1 OPLOCK2 OPLOCK3 OPLOCK4 STREAMERROR"
 tests="$tests DIR DIR1 DIR-CREATETIME TCON TCONDEV RW1 RW2 RW3 RW-SIGNING"
-tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K"
+tests="$tests OPEN XCOPY RENAME DELETE DELETE-LN PROPERTIES W2K"
 tests="$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE CHAIN1"
 tests="$tests GETADDRINFO POSIX UID-REGRESSION-TEST SHORTNAME-TEST"
 tests="$tests LOCAL-BASE64 LOCAL-GENCACHE POSIX-APPEND"
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index fef9ded..fc2af47 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -2169,14 +2169,6 @@ void smbd_smb2_first_negprot(struct smbd_server_connection *sconn,
 	struct smbd_smb2_request *req = NULL;
 	struct tevent_req *subreq;
 
-	if (lp_security() == SEC_SHARE) {
-		DEBUG(2,("WARNING!!: \"security = share\" is deprecated for "
-			"SMB2 servers. Mapping to \"security = user\" and "
-			"\"map to guest = Bad User\"\n" ));
-		lp_do_parameter(-1, "security", "user");
-		lp_do_parameter(-1, "map to guest", "Bad User");
-	}
-
 	DEBUG(10,("smbd_smb2_first_negprot: packet length %u\n",
 		 (unsigned int)size));
 


-- 
Samba Shared Repository