file_server: Fix spoolss support with s3fs.

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

diff --git a/file_server/file_server.c b/file_server/file_server.c
index 0e9d32154602c24fddb7b8948094ef571135cbd9..a3efcb2418d6271504dbd7f161c417c30da6f935 100644 (file)
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -48,8 +48,9 @@ static const char *generate_smb_conf(struct task_server *task)
                return NULL;
        }
 
+       fdprintf(fd, "[globals]\n");
        fdprintf(fd, "# auto-generated config for fileserver\n");
-       fdprintf(fd, "auth methods = guest samba4\n");
+       fdprintf(fd, "server role check:inhibit=yes\n");
        fdprintf(fd, "passdb backend = samba4\n");
         fdprintf(fd, "rpc_server:default = external\n");
        fdprintf(fd, "rpc_server:svcctl = embedded\n");
@@ -58,18 +59,9 @@ static const char *generate_smb_conf(struct task_server *task)
        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_daemon:spoolssd = embedded\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");
@@ -77,9 +69,6 @@ static const char *generate_smb_conf(struct task_server *task)
 
        fdprintf(fd, "include = %s\n", lpcfg_configfile(lp_ctx));
 
-       fdprintf(fd, "[IPC$]\n");
-       fdprintf(fd, " vfs objects = dfs_samba4\n");
-
        close(fd);
        return path;
 }