summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2010-02-13 18:03:08 +0100
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2010-02-13 18:24:07 +0100
commiteed65ed337ae89f864dd833cc39c2f75c5ac3e67 (patch)
tree493106f08dd2ab826f4c69002dbf37463c1e677f /source4
parent9848086aa82d97e7cff33135065df64a6799f0a7 (diff)
downloadsamba-eed65ed337ae89f864dd833cc39c2f75c5ac3e67.tar.gz
samba-eed65ed337ae89f864dd833cc39c2f75c5ac3e67.tar.bz2
samba-eed65ed337ae89f864dd833cc39c2f75c5ac3e67.zip
s4:server.c - use always "return" instead of "exit" in the "binary_smbd_main" function
Just to be consistent - no functional change
Diffstat (limited to 'source4')
-rw-r--r--source4/smbd/server.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 719482796e..91fd553939 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -303,7 +303,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
fprintf(stderr, "\nInvalid option %s: %s\n\n",
poptBadOption(pc, 0), poptStrerror(opt));
poptPrintUsage(pc, stderr, 0);
- exit(1);
+ return 1;
}
}
@@ -311,7 +311,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
fprintf(stderr,"\nERROR: "
"Option -i|--interactive is not allowed together with -D|--daemon\n\n");
poptPrintUsage(pc, stderr, 0);
- exit(1);
+ return 1;
} else if (!opt_interactive) {
/* default is --daemon */
opt_daemon = true;
@@ -333,7 +333,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
DEBUG(0,("ERROR: Samba is not configured correctly for the word size on your machine\n"));
DEBUGADD(0,("sizeof(uint16_t) = %u, sizeof(uint32_t) %u, sizeof(uint64_t) = %u\n",
(unsigned int)sizeof(uint16_t), (unsigned int)sizeof(uint32_t), (unsigned int)sizeof(uint64_t)));
- exit(1);
+ return 1;
}
if (opt_daemon) {
@@ -353,7 +353,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
* passdb/secrets.c, and proved that Samba still builds... */
/* Setup the SECRETS subsystem */
if (secrets_init(talloc_autofree_context(), cmdline_lp_ctx) == NULL) {
- exit(1);
+ return 1;
}
gensec_init(cmdline_lp_ctx); /* FIXME: */