[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1628-g4dce2df

[Jeremy Allison]

The branch, master has been updated
       via  4dce2dfb5b547d90b13597672abc2cae1a062b53 (commit)
       via  ff9375a04c3f5ed088678b7915422eefed2e16b8 (commit)
      from  f61959e87abdc85594cea83fadc9e173852cf8a6 (commit)

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


- Log -----------------------------------------------------------------
commit 4dce2dfb5b547d90b13597672abc2cae1a062b53
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 14 16:49:34 2009 -0700

    Turn on SHORTNAME-TEST in torture.
    Jeremy.

commit ff9375a04c3f5ed088678b7915422eefed2e16b8
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 14 16:49:18 2009 -0700

    Make us pass SHORTNAME-TEST.
    Jeremy

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

Summary of changes:
 source3/script/tests/test_smbtorture_s3.sh |    2 +-
 source3/smbd/mangle_hash2.c                |   20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index 8150b98..4e439fe 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -28,7 +28,7 @@ tests="$tests OPLOCK1 OPLOCK2 OPLOCK3"
 tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3"
 tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K"
 tests="$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE CHAIN1"
-tests="$tests GETADDRINFO POSIX UID-REGRESSION-TEST"
+tests="$tests GETADDRINFO POSIX UID-REGRESSION-TEST SHORTNAME-TEST"
 
 skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN"
 skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST"
diff --git a/source3/smbd/mangle_hash2.c b/source3/smbd/mangle_hash2.c
index 3a3939c..b9e7d63 100644
--- a/source3/smbd/mangle_hash2.c
+++ b/source3/smbd/mangle_hash2.c
@@ -250,12 +250,17 @@ static bool is_mangled(const char *name, const struct share_params *parm)
 
 
 /* 
-   see if a filename is an allowable 8.3 name.
+   see if a filename is an allowable 8.3 name to return to the client.
+   Note this is not testing if this is a valid Samba mangled name, so
+   the rules are different for is_mangled.
 
    we are only going to allow ascii characters in 8.3 names, as this
    simplifies things greatly (it means that we know the string won't
    get larger when converted from UNIX to DOS formats)
 */
+
+static char force_shortname_chars[] = " +,[];=";
+
 static bool is_8_3(const char *name, bool check_case, bool allow_wildcards, const struct share_params *p)
 {
 	int len, i;
@@ -307,9 +312,18 @@ static bool is_8_3(const char *name, bool check_case, bool allow_wildcards, cons
 
 	/* the length are all OK. Now check to see if the characters themselves are OK */
 	for (i=0; name[i]; i++) {
+		if (FLAG_CHECK(name[i], FLAG_ILLEGAL)) {
+			return false;
+		}
 		/* note that we may allow wildcard petterns! */
-		if (!FLAG_CHECK(name[i], FLAG_ASCII|(allow_wildcards ? FLAG_WILDCARD : 0)) && name[i] != '.') {
-			return False;
+		if (!allow_wildcards && FLAG_CHECK(name[i], FLAG_WILDCARD)) {
+			return false;
+		}
+		if (((unsigned char)name[i]) > 0x7e) {
+			return false;
+		}
+		if (strchr(force_shortname_chars, name[i])) {
+			return false;
 		}
 	}
 


-- 
Samba Shared Repository