diff options
| -rwxr-xr-x | selftest/target/Samba3.pm | 13 | ||||
| -rwxr-xr-x | source3/script/tests/test_smbclient_s3.sh | 38 |
2 files changed, 51 insertions, 0 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index d8eb58c06e1..09e6e2cd4b8 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -882,6 +882,9 @@ sub provision($$$$$$) my $lease2_shrdir="$shrdir/SMB3_00"; push(@dirs,$lease2_shrdir); + my $manglenames_shrdir="$shrdir/manglenames"; + push(@dirs,$manglenames_shrdir); + # this gets autocreated by winbindd my $wbsockdir="$prefix_abs/winbindd"; my $wbsockprivdir="$lockdir/winbindd_privileged"; @@ -964,6 +967,12 @@ sub provision($$$$$$) close(BADNAME_TARGET); chmod 0666, $badname_target; + ## + ## create mangleable directory names in $manglenames_shrdir + ## + my $manglename_target = "$manglenames_shrdir/foo:bar"; + mkdir($manglename_target, 0777); + my $conffile="$libdir/server.conf"; my $nss_wrapper_pl = "$ENV{PERL} $self->{srcdir}/lib/nss_wrapper/nss_wrapper.pl"; @@ -1232,6 +1241,10 @@ sub provision($$$$$$) path = $badnames_shrdir guest ok = yes +[manglenames_share] + path = $manglenames_shrdir + guest ok = yes + [dynamic_share] path = $shrdir/%R guest ok = yes diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh index f6f370588cf..e79228fc4e9 100755 --- a/source3/script/tests/test_smbclient_s3.sh +++ b/source3/script/tests/test_smbclient_s3.sh @@ -863,6 +863,40 @@ test_bad_names() fi } +# Test accessing an share with a name that must be mangled - with acl_xattrs. +# We know foo:bar gets mangled to FF4GBY~Q with the default name-mangling algorithm (hash2). +test_mangled_names() +{ + tmpfile=$PREFIX/smbclient_interactive_prompt_commands + cat > $tmpfile <<EOF +ls +cd FF4GBY~Q +ls +quit +EOF + cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/manglenames_share -I $SERVER_IP $ADDARGS < $tmpfile 2>&1' + eval echo "$cmd" + out=`eval $cmd` + ret=$? + rm -f $tmpfile + + if [ $ret != 0 ] ; then + echo "$out" + echo "failed accessing manglenames_share with error $ret" + false + return + fi + + echo "$out" | grep 'NT_STATUS' + ret=$? + if [ $ret == 0 ] ; then + echo "$out" + echo "failed - NT_STATUS_XXXX listing \\manglenames_share\\FF4GBY~Q" + false + fi +} + + LOGDIR_PREFIX=test_smbclient_s3 # possibly remove old logdirs: @@ -942,6 +976,10 @@ testit "list a share with bad names (won't convert)" \ test_bad_names || \ failed=`expr $failed + 1` +testit "list a share with a mangled name + acl_xattr object" \ + test_mangled_names || \ + failed=`expr $failed + 1` + testit "rm -rf $LOGDIR" \ rm -rf $LOGDIR || \ failed=`expr $failed + 1` |