r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need

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

diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 1914a4acb50ba752c67ff93b43178bdb71aaef5a..fa0545988e9eb3064844db8e16e5ec333f0eac3c 100644 (file)
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -113,7 +113,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)) {
+       if (!lp_load(argv[1], False, True, False, True)) {
                printf("Error loading \"%s\"\n", argv[1]);
                return NT_STATUS_OK;
        }
@@ -410,6 +410,11 @@ void exit_server(const char *reason)
        exit(0);
 }
 
+void exit_server_cleanly(const char *const reason)
+{
+       exit_server("normal exit");
+}
+
 static int server_fd = -1;
 int last_message = -1;
 
@@ -448,7 +453,7 @@ BOOL reload_services(BOOL test)
 
        lp_killunused(conn_snum_used);
        
-       ret = lp_load(dyn_CONFIGFILE, False, False, True);
+       ret = lp_load(dyn_CONFIGFILE, False, False, True, True);
 
        /* perhaps the config filename is now set */
        if (!test)
@@ -570,6 +575,6 @@ int main(int argc, char *argv[])
                        process_cmd(&vfs, line);
        }
        
-       free(vfs.conn);
+       conn_free(vfs.conn);
        return 0;
 }