summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorSteve French <sfrench@samba.org>2006-09-15 19:24:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:47 -0500
commitdb0fdcf6ce8b3d02a5f720652f22a2b7167c5e26 (patch)
tree8a183f343f32b91b325ae9bfa6e2a55fe068d570 /source4
parent6e3b94d3bcaacba0fed4f977248b0fbe6fcd6812 (diff)
downloadsamba-db0fdcf6ce8b3d02a5f720652f22a2b7167c5e26.tar.gz
samba-db0fdcf6ce8b3d02a5f720652f22a2b7167c5e26.tar.bz2
samba-db0fdcf6ce8b3d02a5f720652f22a2b7167c5e26.zip
r18564: update for cifs unix/posix extensions stub version to build and beginnings of smbtorture test for it
(This used to be commit 57f56957176ca04f3abb579b557aade71f8d361d)
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/cifs_posix_cli/svfs_util.c2
-rw-r--r--source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c (renamed from source4/ntvfs/cifs_posix_cli/vfs_simple.c)15
-rw-r--r--source4/ntvfs/config.mk10
-rwxr-xr-xsource4/script/tests/mktestsetup.sh5
-rwxr-xr-xsource4/script/tests/tests_quick.sh2
5 files changed, 21 insertions, 13 deletions
diff --git a/source4/ntvfs/cifs_posix_cli/svfs_util.c b/source4/ntvfs/cifs_posix_cli/svfs_util.c
index b85c43b071..4321a6eb29 100644
--- a/source4/ntvfs/cifs_posix_cli/svfs_util.c
+++ b/source4/ntvfs/cifs_posix_cli/svfs_util.c
@@ -26,10 +26,10 @@
#include "includes.h"
#include "system/filesys.h"
#include "cvfs.h"
-#include "system/time.h"
#include "system/dir.h"
#include "ntvfs/ntvfs.h"
+
/*
convert a windows path to a unix path - don't do any manging or case sensitive handling
*/
diff --git a/source4/ntvfs/cifs_posix_cli/vfs_simple.c b/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c
index 2fd5572c0c..bd1195d896 100644
--- a/source4/ntvfs/cifs_posix_cli/vfs_simple.c
+++ b/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c
@@ -1,9 +1,11 @@
/*
Unix SMB/CIFS implementation.
- simple NTVFS filesystem backend
+ NTVFS filesystem backend for Linux CIFS client and clients which support
+ CIFS Unix extensions
Copyright (C) Andrew Tridgell 2003
+ Copyright (C) Steve French 2006
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -31,10 +33,8 @@
*/
#include "includes.h"
-#include "system/dir.h"
#include "system/filesys.h"
#include "cvfs.h"
-#include "system/time.h"
#include "lib/util/dlinklist.h"
#include "ntvfs/ntvfs.h"
#include "ntvfs/cifs_posix_cli/proto.h"
@@ -64,6 +64,7 @@ static NTSTATUS svfs_connect(struct ntvfs_module_context *ntvfs,
private->open_files = NULL;
private->search = NULL;
+ DEBUG(0,("cifs backend: connect to %s",sharename));
/* the directory must exist */
if (stat(private->connectpath, &st) != 0 || !S_ISDIR(st.st_mode)) {
DEBUG(0,("'%s' is not a directory, when connecting to [%s]\n",
@@ -790,7 +791,7 @@ static NTSTATUS svfs_search_first(struct ntvfs_module_context *ntvfs,
union smb_search_data file;
uint_t max_count;
- if (io->generic.level != RAW_SEARCH_BOTH_DIRECTORY_INFO) {
+ if (io->generic.level != RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO) {
return NT_STATUS_NOT_SUPPORTED;
}
@@ -860,7 +861,7 @@ static NTSTATUS svfs_search_next(struct ntvfs_module_context *ntvfs,
union smb_search_data file;
uint_t max_count;
- if (io->generic.level != RAW_SEARCH_BOTH_DIRECTORY_INFO) {
+ if (io->generic.level != RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO) {
return NT_STATUS_NOT_SUPPORTED;
}
@@ -1009,11 +1010,11 @@ NTSTATUS ntvfs_cifs_posix_init(void)
ops.cancel = svfs_cancel;
/* register ourselves with the NTVFS subsystem. We register
- under names 'simple'
+ under name 'cifsposix'
*/
ops.type = NTVFS_DISK;
- ops.name = "cifs-posix-cli";
+ ops.name = "cifsposix";
ret = ntvfs_register(&ops, &vers);
if (!NT_STATUS_IS_OK(ret)) {
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index ce1e37dc54..a985348fdb 100644
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -29,16 +29,16 @@ OBJ_FILES = \
################################################
################################################
-# Start MODULE ntvfs_cifs_posix_cli
-[MODULE::ntvfs_cifs_posix]
-ENABLE = NO
+# Start MODULE ntvfs_cifsposix
+[MODULE::ntvfs_cifsposix]
+#ENABLE = NO
INIT_FUNCTION = ntvfs_cifs_posix_init
SUBSYSTEM = ntvfs
PRIVATE_PROTO_HEADER = cifs_posix_cli/proto.h
OBJ_FILES = \
- cifs_posix_cli/vfs_simple.o \
+ cifs_posix_cli/vfs_cifs_posix.o \
cifs_posix_cli/svfs_util.o
-# End MODULE ntvfs_cifs_posix_cli
+# End MODULE ntvfs_cifsposix
################################################
################################################
diff --git a/source4/script/tests/mktestsetup.sh b/source4/script/tests/mktestsetup.sh
index 9453a2f0cd..181959aa5b 100755
--- a/source4/script/tests/mktestsetup.sh
+++ b/source4/script/tests/mktestsetup.sh
@@ -118,6 +118,11 @@ system:anonymous = true
cifs:password = $PASSWORD
cifs:domain = $DOMAIN
cifs:share = tmp
+
+[cifsposixtestshare]
+ read only = no
+ ntvfs handler = cifsposix
+ path = $TMPDIR
EOF
## Override default srahes_config.ldb file
diff --git a/source4/script/tests/tests_quick.sh b/source4/script/tests/tests_quick.sh
index 80eeb57f34..7b7d35fcce 100755
--- a/source4/script/tests/tests_quick.sh
+++ b/source4/script/tests/tests_quick.sh
@@ -9,3 +9,5 @@ $SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD || failed=`expr $f
$SRCDIR/script/tests/test_nbt.sh $SERVER || failed=`expr $failed + $?`
$SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
$SRCDIR/script/tests/test_rpc_quick.sh $SERVER $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?`
+#$SRCDIR/script/tests/test_cifsposix.sh //$SERVER/cifsposixtestshare $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+