summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source3/torture/cmd_vfs.c125
-rw-r--r--source3/torture/vfstest.c98
2 files changed, 207 insertions, 16 deletions
diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index 29af3c9a5f..24601207e6 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -28,16 +28,24 @@ static char *null_string = "";
static NTSTATUS cmd_load_module(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
struct smb_vfs_handle_struct *handle;
+ char *path = lp_vfs_path(0);
+ char name[PATH_MAX];
if (argc != 2) {
printf("Usage: load <module path>\n");
return NT_STATUS_OK;
}
+
+ if (path != NULL && *path != '\0') {
+ snprintf(name, PATH_MAX, "%s/%s", path, argv[1]);
+ } else {
+ snprintf(name, PATH_MAX, "%s", argv[1]);
+ }
vfs->conn->vfs_private = NULL;
handle = (struct smb_vfs_handle_struct *) smb_xmalloc(sizeof(smb_vfs_handle_struct));
handle->handle = NULL;
DLIST_ADD(vfs->conn->vfs_private, handle)
- if (!vfs_init_custom(vfs->conn, argv[1])) {
+ if (!vfs_init_custom(vfs->conn, name)) {
DEBUG(0, ("load: error=-1 (vfs_init_custom failed for %s)\n", argv[1]));
return NT_STATUS_UNSUCCESSFUL;
}
@@ -197,7 +205,8 @@ static NTSTATUS cmd_closedir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int arg
static NTSTATUS cmd_open(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
- int flags, mode, fd;
+ int flags, fd;
+ mode_t mode;
char *flagstr;
mode = 00400;
@@ -520,7 +529,7 @@ static NTSTATUS cmd_stat(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
printf(" Size: %10d", st.st_size);
printf(" Blocks: %9d", st.st_blocks);
printf(" IO Block: %d\n", st.st_blksize);
- printf(" Device: 0x%.10x", st.st_dev);
+ printf(" Device: 0x%10x", st.st_dev);
printf(" Inode: %10d", st.st_ino);
printf(" Links: %10d\n", st.st_nlink);
printf(" Access: %05o", (st.st_mode) & 007777);
@@ -808,7 +817,84 @@ static NTSTATUS cmd_ftruncate(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int ar
static NTSTATUS cmd_lock(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
- printf("lock: Not yet implemented!\n");
+ BOOL ret;
+ int fd;
+ int op;
+ long offset;
+ long count;
+ int type;
+ char *typestr;
+
+ if (argc != 6) {
+ printf("Usage: lock <fd> <op> <offset> <count> <type>\n");
+ printf(" ops: G = F_GETLK\n");
+ printf(" S = F_SETLK\n");
+ printf(" W = F_SETLKW\n");
+ printf(" type: R = F_RDLCK\n");
+ printf(" W = F_WRLCK\n");
+ printf(" U = F_UNLCK\n");
+ return NT_STATUS_OK;
+ }
+
+ if (sscanf(argv[1], "%d", &fd) == 0) {
+ printf("lock: error=-1 (error parsing fd)\n");
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+ op = 0;
+ switch (*argv[2]) {
+ case 'G':
+ op = F_GETLK;
+ break;
+ case 'S':
+ op = F_SETLK;
+ break;
+ case 'W':
+ op = F_SETLKW;
+ break;
+ default:
+ printf("lock: error=-1 (invalid op flag!)\n");
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+ if (sscanf(argv[3], "%ld", &offset) == 0) {
+ printf("lock: error=-1 (error parsing fd)\n");
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+ if (sscanf(argv[4], "%ld", &count) == 0) {
+ printf("lock: error=-1 (error parsing fd)\n");
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+ type = 0;
+ typestr = argv[5];
+ while(*typestr) {
+ switch (*typestr) {
+ case 'R':
+ type |= F_RDLCK;
+ break;
+ case 'W':
+ type |= F_WRLCK;
+ break;
+ case 'U':
+ type |= F_UNLCK;
+ break;
+ default:
+ printf("lock: error=-1 (invalid type flag!)\n");
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+ typestr++;
+ }
+
+ printf("lock: debug lock(fd=%d, op=%d, offset=%ld, count=%ld, type=%d))\n", fd, op, offset, count, type);
+
+ if ((ret = vfs->conn->vfs_ops.lock(vfs->files[fd], fd, op, offset, count, type)) == False) {
+ printf("lock: error=%d (%s)\n", errno, strerror(errno));
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+ printf("lock: ok\n");
return NT_STATUS_OK;
}
@@ -868,7 +954,32 @@ static NTSTATUS cmd_link(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
static NTSTATUS cmd_mknod(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, char **argv)
{
- printf("lock: Not yet implemented!\n");
+ mode_t mode;
+ SMB_DEV_T dev;
+
+ if (argc != 4) {
+ printf("Usage: mknod <path> <mode> <dev>\n");
+ printf(" mode is octal\n");
+ printf(" dev is hex\n");
+ return NT_STATUS_OK;
+ }
+
+ if (sscanf(argv[2], "%o", &mode) == 0) {
+ printf("open: error=-1 (invalid mode!)\n");
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+ if (sscanf(argv[3], "%x", &dev) == 0) {
+ printf("open: error=-1 (invalid dev!)\n");
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+ if (vfs->conn->vfs_ops.mknod(vfs->conn, argv[1], mode, dev) == -1) {
+ printf("mknod: error=%d (%s)\n", errno, strerror(errno));
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+ printf("mknod: ok\n");
return NT_STATUS_OK;
}
@@ -924,11 +1035,11 @@ struct cmd_set vfs_commands[] = {
{ "getwd", cmd_getwd, "VFS getwd()", "getwd" },
{ "utime", cmd_utime, "VFS utime()", "utime <path> <access> <modify>" },
{ "ftruncate", cmd_ftruncate, "VFS ftruncate()", "ftruncate <fd> <length>" },
- { "lock", cmd_lock, "VFS lock()", "lock: Not yet implemented!" },
+ { "lock", cmd_lock, "VFS lock()", "lock <f> <op> <offset> <count> <type>" },
{ "symlink", cmd_symlink, "VFS symlink()", "symlink <old> <new>" },
{ "readlink", cmd_readlink, "VFS readlink()", "readlink <path>" },
{ "link", cmd_link, "VFS link()", "link <oldpath> <newpath>" },
- { "mknod", cmd_mknod, "VFS mknod()", "mknod: Not yet implemented!" },
+ { "mknod", cmd_mknod, "VFS mknod()", "mknod <path> <mode> <dev>" },
{ "realpath", cmd_realpath, "VFS realpath()", "realpath <path>" },
{ NULL }
};
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 9deb309352..b76c289c17 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -35,6 +35,8 @@ static struct cmd_list {
TALLOC_CTX *global_ctx;
+extern pstring user_socket_options;
+
/****************************************************************************
handle completion of commands for readline
****************************************************************************/
@@ -87,7 +89,7 @@ static char **completion_fn(char *text, int start, int end)
return matches;
}
-static char* next_command (char** cmdstr)
+static char* next_command(char** cmdstr)
{
static pstring command;
char *p;
@@ -382,6 +384,26 @@ static NTSTATUS process_cmd(struct vfs_state *vfs, char *cmd)
return result;
}
+static void process_file(struct vfs_state *pvfs, char *filename) {
+ FILE *file;
+ char command[3 * PATH_MAX];
+
+ if (*filename == '-') {
+ file = stdin;
+ } else {
+ file = fopen(filename, "r");
+ if (file == NULL) {
+ printf("vfstest: error reading file (%s)!", filename);
+ printf("errno n.%d: %s", errno, strerror(errno));
+ exit(-1);
+ }
+ }
+
+ while (fgets(command, 3 * PATH_MAX, file) != NULL) {
+ process_cmd(pvfs, command);
+ }
+}
+
void exit_server(char *reason)
{
DEBUG(3,("Server exit (%s)\n", (reason ? reason : "")));
@@ -396,9 +418,57 @@ int smbd_server_fd(void)
return server_fd;
}
+/****************************************************************************
+ Reload the services file.
+**************************************************************************/
+
BOOL reload_services(BOOL test)
{
- return True;
+ BOOL ret;
+
+ if (lp_loaded()) {
+ pstring fname;
+ pstrcpy(fname,lp_configfile());
+ if (file_exist(fname, NULL) &&
+ !strcsequal(fname, dyn_CONFIGFILE)) {
+ pstrcpy(dyn_CONFIGFILE, fname);
+ test = False;
+ }
+ }
+
+ reopen_logs();
+
+ if (test && !lp_file_list_changed())
+ return(True);
+
+ lp_killunused(conn_snum_used);
+
+ ret = lp_load(dyn_CONFIGFILE, False, False, True);
+
+ load_printers();
+
+ /* perhaps the config filename is now set */
+ if (!test)
+ reload_services(True);
+
+ reopen_logs();
+
+ load_interfaces();
+
+ {
+ if (smbd_server_fd() != -1) {
+ set_socket_options(smbd_server_fd(),"SO_KEEPALIVE");
+ set_socket_options(smbd_server_fd(), user_socket_options);
+ }
+ }
+
+ mangle_reset_cache();
+ reset_stat_cache();
+
+ /* this forces service parameters to be flushed */
+ set_current_service(NULL,True);
+
+ return (ret);
}
/* Print usage information */
@@ -407,6 +477,7 @@ static void usage(void)
printf("Usage: vfstest [options]\n");
printf("\t-c or --command \"command string\" execute semicolon separated cmds\n");
+ printf("\t-f or --file filename execute a set of operations as described in the file\n");
printf("\t-d or --debug debuglevel set the debuglevel\n");
printf("\t-l or --logfile logfile logfile to use instead of stdout\n");
printf("\t-h or --help Print this help message.\n");
@@ -420,19 +491,20 @@ int main(int argc, char *argv[])
BOOL interactive = True;
int opt;
static char *cmdstr = "";
- static char *opt_logfile=NULL;
+ static char *opt_logfile=NULL;
static int opt_debuglevel;
pstring logfile;
struct cmd_set **cmd_set;
extern BOOL AllowDebugChange;
static struct vfs_state vfs;
int i;
-
+ static char *filename = "";
/* make sure the vars that get altered (4th field) are in
a fixed location or certain compilers complain */
poptContext pc;
struct poptOption long_options[] = {
+ {"file", 'f', POPT_ARG_STRING, &filename},
{"debug", 'd', POPT_ARG_INT, &opt_debuglevel, 'd'},
{"debuglevel", 'd', POPT_ARG_INT, &opt_debuglevel, 'd'},
{"command", 'c', POPT_ARG_STRING, &cmdstr},
@@ -473,6 +545,9 @@ int main(int argc, char *argv[])
poptFreeContext(pc);
+ /* TODO: check output */
+ reload_services(False);
+
/* the following functions are part of the Samba debugging
facilities. See lib/debug.c */
setup_logging("vfstest", interactive);
@@ -495,7 +570,16 @@ int main(int argc, char *argv[])
for (i=0; i < 1024; i++)
vfs.files[i] = NULL;
- /* Do anything specified with -c */
+ /* some advanced initiliazation stuff */
+ smbd_vfs_init(vfs.conn);
+
+ /* Do we have a file input? */
+ if (filename[0]) {
+ process_file(&vfs, filename);
+ return 0;
+ }
+
+ /* Do anything specified with -c */
if (cmdstr[0]) {
char *cmd;
char *p = cmdstr;
@@ -507,10 +591,6 @@ int main(int argc, char *argv[])
return 0;
}
- /* Initialize VFS */
- vfs.conn->vfs_private = NULL;
- smbd_vfs_init(vfs.conn);
-
/* Loop around accepting commands */
while(1) {
generated by cgit (git 2.34.1) at 2024-11-28 11:37:35 +0000