diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/modules/vfs_default.c | 3 | ||||
| -rwxr-xr-x | source3/script/tests/selftest.sh | 4 | ||||
| -rw-r--r-- | source3/script/tests/test_functions.sh | 4 | ||||
| -rwxr-xr-x | source3/script/tests/test_posix_s3.sh | 9 | ||||
| -rwxr-xr-x | source3/script/tests/tests_all.sh | 6 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 2 |
6 files changed, 18 insertions, 10 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 4febc064d9..d1772eaf08 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -905,8 +905,7 @@ static NTSTATUS vfswrap_notify_watch(vfs_handle_struct *vfs_handle, static int vfswrap_chflags(vfs_handle_struct *handle, const char *path, int flags) { - errno = ENOSYS; - return -1; + return chflags(path, flags); } static size_t vfswrap_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, int fd, uint32 security_info, SEC_DESC **ppdesc) diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index d5cd2fbeda..ba194dfa11 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -1,5 +1,6 @@ #!/bin/sh +set -x if [ $# != 3 ]; then echo "$0 <directory> <all | quick> <smbtorture4>" exit 1 @@ -93,7 +94,6 @@ cat >$COMMONCONFFILE<<EOF pid directory = $PIDDIR lock directory = $LOCKDIR log file = $LOGDIR/log.%m - log level = 0 name resolve order = bcast EOF @@ -120,6 +120,7 @@ EOF cat >$SERVERCONFFILE<<EOF [global] + log level = 10 netbios name = $SERVER interfaces = $SERVER_IP/8 bind interfaces only = yes @@ -146,6 +147,7 @@ cat >$SERVERCONFFILE<<EOF map hidden = yes map system = yes create mask = 755 + guest ok = yes [hideunread] copy = tmp hide unreadable = yes diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh index 1cc9ea1264..0089f620a3 100644 --- a/source3/script/tests/test_functions.sh +++ b/source3/script/tests/test_functions.sh @@ -45,7 +45,7 @@ samba3_check_or_start() { fi MAKE_TEST_BINARY=$BINDIR/nmbd export MAKE_TEST_BINARY - timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 & + timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 & TIMELIMIT_NMBD_PID=$! MAKE_TEST_BINARY= echo $TIMELIMIT_NMBD_PID > $PIDDIR/timelimit.nmbd.pid @@ -77,7 +77,7 @@ samba3_check_or_start() { fi MAKE_TEST_BINARY=$BINDIR/smbd export MAKE_TEST_BINARY - timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 & + timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F --no-process-group -s $SERVERCONFFILE -l $SOCKET_WRAPPER_DIR > $SMBD_TEST_LOG 2>&1 & TIMELIMIT_SMBD_PID=$! MAKE_TEST_BINARY= echo $TIMELIMIT_SMBD_PID > $PIDDIR/timelimit.smbd.pid diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh index a56032c7f4..4d41786e6e 100755 --- a/source3/script/tests/test_posix_s3.sh +++ b/source3/script/tests/test_posix_s3.sh @@ -36,11 +36,18 @@ raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH" rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC" rpc="$rpc RPC-UNIXINFO RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC" +base= +raw= +rpc= +unix="UNIX-WHOAMI UNIX-INFO2" + +RUN_FROM_BUILD_FARM=no + if test x$RUN_FROM_BUILD_FARM = xyes; then rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME" fi -tests="$base $raw $rpc" +tests="$base $raw $rpc $unix" skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV" skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS" diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh index dd593899e4..2287f82978 100755 --- a/source3/script/tests/tests_all.sh +++ b/source3/script/tests/tests_all.sh @@ -1,7 +1,7 @@ -$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?` -$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?` -$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?` +#$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?` +#$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?` +#$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?` SMBTORTURE4VERSION=`$SMBTORTURE4 --version` if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 45eb0067ef..a298a258f0 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -3069,7 +3069,7 @@ static BOOL map_info2_flags_to_sbuf(const SMB_STRUCT_STAT *psbuf, int *stat_fflags) { #ifdef HAVE_STAT_ST_FLAGS - uint32 max_fmask; + uint32 max_fmask = 0; int i; *stat_fflags = psbuf->st_flags; |