svn commit: samba r21767 - in branches/SAMBA_3_0/source: modules
script/tests
jpeach at samba.org
jpeach at samba.org
Thu Mar 8 21:30:21 GMT 2007
Author: jpeach
Date: 2007-03-08 21:30:15 +0000 (Thu, 08 Mar 2007)
New Revision: 21767
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21767
Log:
Revert all the bits I accidentally committed in r21766.
Modified:
branches/SAMBA_3_0/source/modules/vfs_default.c
branches/SAMBA_3_0/source/script/tests/selftest.sh
branches/SAMBA_3_0/source/script/tests/test_functions.sh
branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh
branches/SAMBA_3_0/source/script/tests/tests_all.sh
Changeset:
Modified: branches/SAMBA_3_0/source/modules/vfs_default.c
===================================================================
--- branches/SAMBA_3_0/source/modules/vfs_default.c 2007-03-08 20:54:13 UTC (rev 21766)
+++ branches/SAMBA_3_0/source/modules/vfs_default.c 2007-03-08 21:30:15 UTC (rev 21767)
@@ -905,7 +905,8 @@
static int vfswrap_chflags(vfs_handle_struct *handle, const char *path, int flags)
{
- return chflags(path, flags);
+ errno = ENOSYS;
+ return -1;
}
static size_t vfswrap_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, int fd, uint32 security_info, SEC_DESC **ppdesc)
Modified: branches/SAMBA_3_0/source/script/tests/selftest.sh
===================================================================
--- branches/SAMBA_3_0/source/script/tests/selftest.sh 2007-03-08 20:54:13 UTC (rev 21766)
+++ branches/SAMBA_3_0/source/script/tests/selftest.sh 2007-03-08 21:30:15 UTC (rev 21767)
@@ -1,6 +1,5 @@
#!/bin/sh
-set -x
if [ $# != 3 ]; then
echo "$0 <directory> <all | quick> <smbtorture4>"
exit 1
@@ -94,6 +93,7 @@
pid directory = $PIDDIR
lock directory = $LOCKDIR
log file = $LOGDIR/log.%m
+ log level = 0
name resolve order = bcast
EOF
@@ -120,7 +120,6 @@
cat >$SERVERCONFFILE<<EOF
[global]
- log level = 10
netbios name = $SERVER
interfaces = $SERVER_IP/8
bind interfaces only = yes
@@ -147,7 +146,6 @@
map hidden = yes
map system = yes
create mask = 755
- guest ok = yes
[hideunread]
copy = tmp
hide unreadable = yes
Modified: branches/SAMBA_3_0/source/script/tests/test_functions.sh
===================================================================
--- branches/SAMBA_3_0/source/script/tests/test_functions.sh 2007-03-08 20:54:13 UTC (rev 21766)
+++ branches/SAMBA_3_0/source/script/tests/test_functions.sh 2007-03-08 21:30:15 UTC (rev 21767)
@@ -45,7 +45,7 @@
fi
MAKE_TEST_BINARY=$BINDIR/nmbd
export MAKE_TEST_BINARY
- timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
+ timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -d0 -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 @@
fi
MAKE_TEST_BINARY=$BINDIR/smbd
export MAKE_TEST_BINARY
- timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F --no-process-group -s $SERVERCONFFILE -l $SOCKET_WRAPPER_DIR > $SMBD_TEST_LOG 2>&1 &
+ timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 &
TIMELIMIT_SMBD_PID=$!
MAKE_TEST_BINARY=
echo $TIMELIMIT_SMBD_PID > $PIDDIR/timelimit.smbd.pid
Modified: branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh
===================================================================
--- branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh 2007-03-08 20:54:13 UTC (rev 21766)
+++ branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh 2007-03-08 21:30:15 UTC (rev 21767)
@@ -36,18 +36,11 @@
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 $unix"
+tests="$base $raw $rpc"
skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
Modified: branches/SAMBA_3_0/source/script/tests/tests_all.sh
===================================================================
--- branches/SAMBA_3_0/source/script/tests/tests_all.sh 2007-03-08 20:54:13 UTC (rev 21766)
+++ branches/SAMBA_3_0/source/script/tests/tests_all.sh 2007-03-08 21:30:15 UTC (rev 21767)
@@ -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
More information about the samba-cvs
mailing list