wscript: Add check for --wrap linker flag

[vlendec/samba-autobuild/.git] / source3 / torture / vfstest.c

diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index b039ac408bee5df424cfcf596eb0ea0bf4e73aef..f156def46471dfd2760056d61a7af480e1f71640 100644 (file)
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -127,7 +127,7 @@ static NTSTATUS cmd_conf(struct vfs_state *vfs, TALLOC_CTX *mem_ctx,
                return NT_STATUS_OK;
        }
 
-       if (!lp_load(argv[1], False, True, False, True)) {
+       if (!lp_load_with_shares(argv[1])) {
                printf("Error loading \"%s\"\n", argv[1]);
                return NT_STATUS_OK;
        }
@@ -487,7 +487,7 @@ int main(int argc, const char *argv[])
                .exit_server_cleanly = vfstest_exit_server_cleanly,
        };
 
-       load_case_tables();
+       smb_init_locale();
 
        setlinebuf(stdout);
 
@@ -527,7 +527,6 @@ int main(int argc, const char *argv[])
        sec_init();
        init_guest_info();
        locking_init();
-       serverid_parent_init(NULL);
        vfs = talloc_zero(NULL, struct vfs_state);
        if (vfs == NULL) {
                return 1;
@@ -553,7 +552,6 @@ int main(int argc, const char *argv[])
        vfs->conn->share_access = FILE_GENERIC_ALL;
        vfs->conn->read_only = false;
 
-       serverid_register(messaging_server_id(vfs->conn->sconn->msg_ctx), 0);
        file_init(vfs->conn->sconn);
        for (i=0; i < 1024; i++)
                vfs->files[i] = NULL;