The branch, master has been updated
via 8c66c8c s3: Test for bug 8733
via 207af5d s3-vfstest: Correctly initialize the connection path
via 1bd7497 s3-vfstest: Fix some uninitialized vars
via 3c6bd8c s3-vfstest: Fix some pointless statics
via 1168700 s3-vfstest: Fix a typo
via 435f817 s3-vfstest: Fix some nonblank line endings
from 6ba09e0 s3:smbd:smb2: fix an assignment-instead-of-check bug
conn_snum_used()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8c66c8c756bde8654a3c1d07082b0ca5d357dc29
Author: Volker Lendecke <[email protected]>
Date: Wed Feb 1 20:07:24 2012 +0100
s3: Test for bug 8733
Autobuild-User: Volker Lendecke <[email protected]>
Autobuild-Date: Wed Feb 1 21:53:50 CET 2012 on sn-devel-104
commit 207af5d9e397eabbddbb2d273f542f641123aeb4
Author: Volker Lendecke <[email protected]>
Date: Wed Feb 1 19:44:32 2012 +0100
s3-vfstest: Correctly initialize the connection path
commit 1bd7497a18f3b42a5068e6a259a7f03c880f0020
Author: Volker Lendecke <[email protected]>
Date: Wed Feb 1 19:43:46 2012 +0100
s3-vfstest: Fix some uninitialized vars
commit 3c6bd8c1ef0cee7d63ce870f320ad5fc83b1dc7b
Author: Volker Lendecke <[email protected]>
Date: Wed Feb 1 19:42:55 2012 +0100
s3-vfstest: Fix some pointless statics
commit 1168700d91c4443a580e8b7c84f6ce3fd3181dab
Author: Volker Lendecke <[email protected]>
Date: Wed Feb 1 19:34:22 2012 +0100
s3-vfstest: Fix a typo
commit 435f8173299045e344d538ab7de03748560b420c
Author: Volker Lendecke <[email protected]>
Date: Wed Feb 1 14:42:39 2012 +0100
s3-vfstest: Fix some nonblank line endings
-----------------------------------------------------------------------
Summary of changes:
source3/tests/stream-depot/run.sh | 9 ++++++
source3/tests/stream-depot/smb.conf | 5 +++
source3/tests/stream-depot/vfstest.cmd | 5 +++
source3/torture/cmd_vfs.c | 20 +++++++-------
source3/torture/vfstest.c | 43 ++++++++++++++++---------------
5 files changed, 51 insertions(+), 31 deletions(-)
create mode 100755 source3/tests/stream-depot/run.sh
create mode 100644 source3/tests/stream-depot/smb.conf
create mode 100644 source3/tests/stream-depot/vfstest.cmd
Changeset truncated at 500 lines:
diff --git a/source3/tests/stream-depot/run.sh
b/source3/tests/stream-depot/run.sh
new file mode 100755
index 0000000..f459aa3
--- /dev/null
+++ b/source3/tests/stream-depot/run.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+rm -r .streams
+../../bin/vfstest -s smb.conf -f vfstest.cmd
+NUM=`find .streams | wc -l`
+if [ $NUM -ne 3 ] ; then
+ echo "streams_depot left ${NUM} in .streams, expected 3"
+ exit 1
+fi
+exit 0
diff --git a/source3/tests/stream-depot/smb.conf
b/source3/tests/stream-depot/smb.conf
new file mode 100644
index 0000000..426d23c
--- /dev/null
+++ b/source3/tests/stream-depot/smb.conf
@@ -0,0 +1,5 @@
+[tmp]
+# "path" is ignored by vfstest, it's always set to $(pwd)
+path = /tmp
+writable = yes
+vfs objects = streams_depot xattr_tdb
diff --git a/source3/tests/stream-depot/vfstest.cmd
b/source3/tests/stream-depot/vfstest.cmd
new file mode 100644
index 0000000..1400546
--- /dev/null
+++ b/source3/tests/stream-depot/vfstest.cmd
@@ -0,0 +1,5 @@
+connect
+mkdir x
+open x:y RC 0770
+unlink x:y
+rmdir x
diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index 9527a34..7c44a48 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -1,4 +1,4 @@
-/*
+/*
Unix SMB/CIFS implementation.
VFS module functions
@@ -9,12 +9,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -31,7 +31,7 @@ static const char *null_string = "";
static NTSTATUS cmd_load_module(struct vfs_state *vfs, TALLOC_CTX *mem_ctx,
int argc, const char **argv)
{
int i;
-
+
if (argc < 2) {
printf("Usage: load <modules>\n");
return NT_STATUS_OK;
@@ -207,7 +207,7 @@ static NTSTATUS cmd_mkdir(struct vfs_state *vfs, TALLOC_CTX
*mem_ctx, int argc,
printf("mkdir error=%d (%s)\n", errno, strerror(errno));
return NT_STATUS_UNSUCCESSFUL;
}
-
+
printf("mkdir: ok\n");
return NT_STATUS_OK;
}
@@ -216,7 +216,7 @@ static NTSTATUS cmd_mkdir(struct vfs_state *vfs, TALLOC_CTX
*mem_ctx, int argc,
static NTSTATUS cmd_closedir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int
argc, const char **argv)
{
int ret;
-
+
if (vfs->currentdir == NULL) {
printf("closedir: failure (no directory open)\n");
return NT_STATUS_UNSUCCESSFUL;
@@ -441,7 +441,7 @@ static NTSTATUS cmd_read(struct vfs_state *vfs, TALLOC_CTX
*mem_ctx, int argc, c
return NT_STATUS_UNSUCCESSFUL;
}
vfs->data_size = size;
-
+
rsize = SMB_VFS_READ(vfs->files[fd], vfs->data, size);
if (rsize == -1) {
printf("read: error=%d (%s)\n", errno, strerror(errno));
@@ -781,7 +781,7 @@ static NTSTATUS cmd_lstat(struct vfs_state *vfs, TALLOC_CTX
*mem_ctx, int argc,
printf(" Modify: %s", ctime(&tmp_time));
tmp_time = convert_timespec_to_time_t(st.st_ex_ctime);
printf(" Change: %s", ctime(&tmp_time));
-
+
return NT_STATUS_OK;
}
@@ -970,7 +970,7 @@ static NTSTATUS cmd_lock(struct vfs_state *vfs, TALLOC_CTX
*mem_ctx, int argc, c
long count;
int type;
const char *typestr;
-
+
if (argc != 6) {
printf("Usage: lock <fd> <op> <offset> <count> <type>\n");
printf(" ops: G = F_GETLK\n");
@@ -1103,7 +1103,7 @@ static NTSTATUS cmd_mknod(struct vfs_state *vfs,
TALLOC_CTX *mem_ctx, int argc,
mode_t mode;
unsigned int dev_val;
SMB_DEV_T dev;
-
+
if (argc != 4) {
printf("Usage: mknod <path> <mode> <dev>\n");
printf(" mode is octal\n");
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 01deba0..95c377a 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -1,4 +1,4 @@
-/*
+/*
Unix SMB/CIFS implementation.
VFS module tester
@@ -13,12 +13,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -45,11 +45,11 @@ static char **completion_fn(const char *text, int start,
int end)
int i, count=0;
struct cmd_list *commands = cmd_list;
- if (start)
+ if (start)
return NULL;
/* make sure we have a list of valid commands */
- if (!commands)
+ if (!commands)
return NULL;
matches = SMB_MALLOC_ARRAY(char *, MAX_COMPLETIONS);
@@ -58,25 +58,24 @@ static char **completion_fn(const char *text, int start,
int end)
matches[count++] = SMB_STRDUP(text);
if (!matches[0]) return NULL;
- while (commands && count < MAX_COMPLETIONS-1)
+ while (commands && count < MAX_COMPLETIONS-1)
{
if (!commands->cmd_set)
break;
-
+
for (i=0; commands->cmd_set[i].name; i++)
{
if ((strncmp(text, commands->cmd_set[i].name,
strlen(text)) == 0) &&
- commands->cmd_set[i].fn)
+ commands->cmd_set[i].fn)
{
matches[count] =
SMB_STRDUP(commands->cmd_set[i].name);
- if (!matches[count])
+ if (!matches[count])
return NULL;
count++;
}
}
-
+
commands = commands->next;
-
}
if (count == 2) {
@@ -121,7 +120,7 @@ static NTSTATUS cmd_conf(struct vfs_state *vfs, TALLOC_CTX
*mem_ctx,
printf("\"%s\" successfully loaded\n", argv[1]);
return NT_STATUS_OK;
}
-
+
/* Display help on commands */
static NTSTATUS cmd_help(struct vfs_state *vfs, TALLOC_CTX *mem_ctx,
int argc, const char **argv)
@@ -139,7 +138,7 @@ static NTSTATUS cmd_help(struct vfs_state *vfs, TALLOC_CTX
*mem_ctx,
if (argc == 2) {
for (tmp = cmd_list; tmp; tmp = tmp->next) {
-
+
tmp_set = tmp->cmd_set;
while(tmp_set->name) {
@@ -418,11 +417,12 @@ int last_message = -1;
int main(int argc, char *argv[])
{
- static char *cmdstr = NULL;
- struct cmd_set **cmd_set;
- static struct vfs_state vfs;
+ char *cmdstr = NULL;
+ struct cmd_set **cmd_set;
+ struct vfs_state vfs = { 0, };
int i;
- static char *filename = NULL;
+ char *filename = NULL;
+ char cwd[MAXPATHLEN];
TALLOC_CTX *frame = talloc_stackframe();
/* make sure the vars that get altered (4th field) are in
@@ -442,7 +442,7 @@ int main(int argc, char *argv[])
pc = poptGetContext("vfstest", argc, (const char **) argv,
long_options, 0);
-
+
while(poptGetNextOpt(pc) != -1);
@@ -456,7 +456,7 @@ int main(int argc, char *argv[])
/* the following functions are part of the Samba debugging
facilities. See lib/debug.c */
setup_logging("vfstest", DEBUG_STDOUT);
-
+
/* Load command lists */
cmd_set = vfstest_command_list;
@@ -470,11 +470,12 @@ int main(int argc, char *argv[])
/* some basic initialization stuff */
sec_init();
vfs.conn = talloc_zero(NULL, connection_struct);
- vfs.conn->params = talloc(vfs.conn, struct share_params);
+ vfs.conn->params = talloc_zero(vfs.conn, struct share_params);
+ set_conn_connectpath(vfs.conn, getcwd(cwd, sizeof(cwd)));
for (i=0; i < 1024; i++)
vfs.files[i] = NULL;
- /* some advanced initiliazation stuff */
+ /* some advanced initialization stuff */
smbd_vfs_init(vfs.conn);
/* Do we have a file input? */
--
Samba Shared Repository
