summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-10-19 10:34:06 +0200
committerStefan Metzmacher <metze@samba.org>2007-10-19 10:34:06 +0200
commit7f82fbad50906866bbb6c0950795644f1c18b099 (patch)
treeb4d809847f041e4781a81cebd2c7f743c1761372
parent30191d1a5704ad2b158386b511558972d539ce47 (diff)
downloadsamba-7f82fbad50906866bbb6c0950795644f1c18b099.tar.gz
samba-7f82fbad50906866bbb6c0950795644f1c18b099.tar.bz2
samba-7f82fbad50906866bbb6c0950795644f1c18b099.zip
fix startup of smbd, nmbd, winbindd
jra: POPT_ARG_VAL arguments need int values. I assume there're more places like this in the cmdline tools. Please fix this properly, as my commit is just a hack to get make test working again. in samba4 we have a workaround for this see smbd/server.c metze (This used to be commit 9cb1937fe8601e526b5c924930500e0a3b52abd5)
-rw-r--r--source3/nmbd/nmbd.c16
-rw-r--r--source3/smbd/server.c10
-rw-r--r--source3/winbindd/winbindd.c8
3 files changed, 14 insertions, 20 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 46808f51de..510e676e33 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -31,15 +31,6 @@ extern bool global_in_nmbd;
extern bool override_logfile;
-/* are we running as a daemon ? */
-static bool is_daemon;
-
-/* fork or run in foreground ? */
-static bool Fork = True;
-
-/* log to standard output ? */
-static bool log_stdout;
-
/* have we found LanMan clients yet? */
bool found_lm_clients = False;
@@ -692,11 +683,14 @@ static bool open_sockets(bool isdaemon, int port)
**************************************************************************** */
int main(int argc, const char *argv[])
{
+ static int is_daemon;
+ static int Fork = True;
+ static int log_stdout;
pstring logfile;
- static bool opt_interactive;
+ static int opt_interactive;
poptContext pc;
static char *p_lmhosts = dyn_LMHOSTSFILE;
- static bool no_process_group = False;
+ static int no_process_group = False;
int opt;
struct poptOption long_options[] = {
POPT_AUTOHELP
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 05bb3504c7..1ae2c71ddd 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -882,11 +882,11 @@ extern void build_options(bool screen);
int main(int argc,const char *argv[])
{
/* shall I run as a daemon */
- static bool is_daemon = False;
- static bool interactive = False;
- static bool Fork = True;
- static bool no_process_group = False;
- static bool log_stdout = False;
+ static int is_daemon = False;
+ static int interactive = False;
+ static int Fork = True;
+ static int no_process_group = False;
+ static int log_stdout = False;
static char *ports = NULL;
static char *profile_level = NULL;
int opt;
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 97bbe063ba..057790a541 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -984,10 +984,10 @@ static void process_loop(void)
int main(int argc, char **argv, char **envp)
{
pstring logfile;
- static bool is_daemon = False;
- static bool Fork = True;
- static bool log_stdout = False;
- static bool no_process_group = False;
+ static int is_daemon = False;
+ static int Fork = True;
+ static int log_stdout = False;
+ static int no_process_group = False;
struct poptOption long_options[] = {
POPT_AUTOHELP
{ "stdout", 'S', POPT_ARG_VAL, &log_stdout, True, "Log to stdout" },