sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r21767: Revert all the bits I accidentally committed in r21766.

Browse Source
This commit is contained in:
James Peach 2007-03-08 21:30:15 +00:00 committed by Gerald (Jerry) Carter
parent f82ac78b2f
commit 7e862b9080
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/modules/vfs_default.c
View File

@ -905,7 +905,8 @@ static NTSTATUS vfswrap_notify_watch(vfs_handle_struct *vfs_handle,
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)

4
source/script/tests/selftest.sh
View File

@ -1,6 +1,5 @@
#!/bin/sh
set -x
if [ $# != 3 ]; then
echo "$0 <directory> <all | quick> <smbtorture4>"
exit 1
@ -94,6 +93,7 @@ cat >$COMMONCONFFILE<<EOF
pid directory = $PIDDIR
lock directory = $LOCKDIR
log file = $LOGDIR/log.%m
log level = 0
name resolve order = bcast
EOF
@ -120,7 +120,6 @@ EOF
cat >$SERVERCONFFILE<<EOF
[global]
log level = 10
netbios name = $SERVER
interfaces = $SERVER_IP/8
bind interfaces only = yes
@ -147,7 +146,6 @@ cat >$SERVERCONFFILE<<EOF
map hidden = yes
map system = yes
create mask = 755
guest ok = yes
[hideunread]
copy = tmp
hide unreadable = yes

4
source/script/tests/test_functions.sh
View File

@ -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 -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 @@ samba3_check_or_start() {
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

9
source/script/tests/test_posix_s3.sh
View File

@ -36,18 +36,11 @@ 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 $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"

6
source/script/tests/tests_all.sh
View File

@ -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