[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-74-g9cb1937
Stefan Metzmacher
metze at samba.org
Fri Oct 19 08:34:42 GMT 2007
The branch, v3-2-test has been updated
via 9cb1937fe8601e526b5c924930500e0a3b52abd5 (commit)
from f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 9cb1937fe8601e526b5c924930500e0a3b52abd5
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Oct 19 10:34:06 2007 +0200
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
-----------------------------------------------------------------------
Summary of changes:
source/nmbd/nmbd.c | 16 +++++-----------
source/smbd/server.c | 10 +++++-----
source/winbindd/winbindd.c | 8 ++++----
3 files changed, 14 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nmbd/nmbd.c b/source/nmbd/nmbd.c
index 46808f5..510e676 100644
--- a/source/nmbd/nmbd.c
+++ b/source/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/source/smbd/server.c b/source/smbd/server.c
index 05bb350..1ae2c71 100644
--- a/source/smbd/server.c
+++ b/source/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/source/winbindd/winbindd.c b/source/winbindd/winbindd.c
index 97bbe06..057790a 100644
--- a/source/winbindd/winbindd.c
+++ b/source/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" },
--
Samba Shared Repository
More information about the samba-cvs
mailing list