Added torture test for bug #8910. Test remove_duplicate_addrs2().

[sfrench/samba-autobuild/.git] / file_server / file_server.c

diff --git a/file_server/file_server.c b/file_server/file_server.c
index 2c5ec43fe1b641fe984351f5c49a262adda97e7b..0e9d32154602c24fddb7b8948094ef571135cbd9 100644 (file)
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -52,12 +52,34 @@ static const char *generate_smb_conf(struct task_server *task)
        fdprintf(fd, "auth methods = guest samba4\n");
        fdprintf(fd, "passdb backend = samba4\n");
         fdprintf(fd, "rpc_server:default = external\n");
-        fdprintf(fd, "rpc_server:dssetup = disabled\n");
+       fdprintf(fd, "rpc_server:svcctl = embedded\n");
+       fdprintf(fd, "rpc_server:srvsvc = embedded\n");
+       fdprintf(fd, "rpc_server:eventlog = embedded\n");
+       fdprintf(fd, "rpc_server:ntsvcs = embedded\n");
+       fdprintf(fd, "rpc_server:winreg = embedded\n");
        fdprintf(fd, "rpc_server:spoolss = embedded\n");
        fdprintf(fd, "rpc_daemon:spoolssd = disabled\n");
        fdprintf(fd, "rpc_server:tcpip = no\n");
 
+       /* If we are using xattr_tdb:file or posix:eadb then we need to load another VFS object */
+       if (lpcfg_parm_string(lp_ctx, NULL, "xattr_tdb", "file")) {
+               fdprintf(fd, "vfs objects = acl_xattr xattr_tdb\n");
+       } else if (lpcfg_parm_string(lp_ctx, NULL, "posix", "eadb")) {
+               fdprintf(fd, "vfs objects = acl_xattr posix_eadb\n");
+       } else {
+               fdprintf(fd, "vfs objects = acl_xattr\n");
+       }
+
+       fdprintf(fd, "map hidden = no\n");
+       fdprintf(fd, "map system = no\n");
+       fdprintf(fd, "map readonly = no\n");
+       fdprintf(fd, "store dos attributes = yes\n");
+
        fdprintf(fd, "include = %s\n", lpcfg_configfile(lp_ctx));
+
+       fdprintf(fd, "[IPC$]\n");
+       fdprintf(fd, " vfs objects = dfs_samba4\n");
+
        close(fd);
        return path;
 }
@@ -101,7 +123,9 @@ static void s3fs_task_init(struct task_server *task)
        req = samba_runcmd_send(task, task->event_ctx, timeval_zero(), 1, 0,
                                smbd_cmd,
                                "--configfile", fileserver_conf,
-                               "--foreground", NULL);
+                               "--foreground",
+                               debug_get_output_is_stdout()?"--log-stdout":NULL,
+                               NULL);
        if (req == NULL) {
                DEBUG(0, ("Failed to start smbd as child daemon\n"));
                goto failed;