TODO file_server: task_server_terminate ...

[metze/samba/wip.git] / file_server / file_server.c

diff --git a/file_server/file_server.c b/file_server/file_server.c
index 70d54f6d18d221a510d19e405216cb5698328e8e..082ed90f7ec553b9713e6337ccaf70e1a21b36c5 100644 (file)
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -48,29 +48,27 @@ 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");
+       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_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");
+       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;
 }
@@ -80,6 +78,9 @@ static const char *generate_smb_conf(struct task_server *task)
  */
 static void file_server_smbd_done(struct tevent_req *subreq)
 {
+       struct task_server *task =
+               tevent_req_callback_data(subreq,
+               struct task_server);
        int sys_errno;
        int ret;
 
@@ -89,6 +90,7 @@ static void file_server_smbd_done(struct tevent_req *subreq)
        } else {
                DEBUG(0,("file_server smbd daemon exited normally\n"));
        }
+       task_server_terminate(task, "Failed to startup s3fs smb task", true);
 }
 
 
@@ -98,7 +100,7 @@ static void file_server_smbd_done(struct tevent_req *subreq)
 static void s3fs_task_init(struct task_server *task)
 {
        const char *fileserver_conf;
-       struct tevent_req *req;
+       struct tevent_req *subreq;
        const char *smbd_path;
        const char *smbd_cmd[2] = { NULL, NULL };
 
@@ -111,18 +113,18 @@ static void s3fs_task_init(struct task_server *task)
        smbd_cmd[0] = smbd_path;
 
        /* start it as a child process */
-       req = samba_runcmd_send(task, task->event_ctx, timeval_zero(), 1, 0,
+       subreq = samba_runcmd_send(task, task->event_ctx, timeval_zero(), 1, 0,
                                smbd_cmd,
                                "--configfile", fileserver_conf,
                                "--foreground",
                                debug_get_output_is_stdout()?"--log-stdout":NULL,
                                NULL);
-       if (req == NULL) {
+       if (subreq == NULL) {
                DEBUG(0, ("Failed to start smbd as child daemon\n"));
                goto failed;
        }
 
-       tevent_req_set_callback(req, file_server_smbd_done, task);
+       tevent_req_set_callback(subreq, file_server_smbd_done, task);
 
        DEBUG(1,("Started file server smbd with config %s\n", fileserver_conf));
        return;