summaryrefslogtreecommitdiff
path: root/file_server
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-09-04 17:18:45 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-09-04 09:52:23 +0200
commit6c9d22d1ed5cc886b7a7c886f7298fea8c60089c (patch)
tree7a7bc3d210da11254ca8caee3d9652ad5bff9022 /file_server
parent30253c11cca5be8b5eaddeb12f1a749315928679 (diff)
downloadsamba-6c9d22d1ed5cc886b7a7c886f7298fea8c60089c.tar.gz
samba-6c9d22d1ed5cc886b7a7c886f7298fea8c60089c.tar.bz2
samba-6c9d22d1ed5cc886b7a7c886f7298fea8c60089c.zip
file_server: Clarify code by avoiding a goto
As suggested by Ricky Nance <ricky.nance@weaubleau.k12.mo.us> Andrew Bartlett
Diffstat (limited to 'file_server')
-rw-r--r--file_server/file_server.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/file_server/file_server.c b/file_server/file_server.c
index a3efcb2418..e1560c202d 100644
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -117,15 +117,13 @@ static void s3fs_task_init(struct task_server *task)
NULL);
if (req == NULL) {
DEBUG(0, ("Failed to start smbd as child daemon\n"));
- goto failed;
+ task_server_terminate(task, "Failed to startup s3fs smb task", true);
+ return;
}
tevent_req_set_callback(req, file_server_smbd_done, task);
DEBUG(1,("Started file server smbd with config %s\n", fileserver_conf));
- return;
-failed:
- task_server_terminate(task, "Failed to startup s3fs smb task", true);
}
/* called at smbd startup - register ourselves as a server service */