summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-30 13:13:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:51 -0500
commit3c3869cea6180fa9d6ff0d28059c9332ee1e3057 (patch)
treeba001d4b6422467b9597e178e004deee20061799
parent16df1115fee2f1cd5bd38cd5a7b4661d4b16367e (diff)
downloadsamba-3c3869cea6180fa9d6ff0d28059c9332ee1e3057.tar.gz
samba-3c3869cea6180fa9d6ff0d28059c9332ee1e3057.tar.bz2
samba-3c3869cea6180fa9d6ff0d28059c9332ee1e3057.zip
r22607: work with the solaris version of popt
metze (This used to be commit c992e882b53525fea995c68be668ba939671139c)
-rw-r--r--source4/utils/testparm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/utils/testparm.c b/source4/utils/testparm.c
index 456baee301..5802553844 100644
--- a/source4/utils/testparm.c
+++ b/source4/utils/testparm.c
@@ -75,11 +75,11 @@ static int do_global_checks(void)
int main(int argc, const char *argv[])
{
int s;
- static BOOL silent_mode = False;
+ static int silent_mode = 0;
int ret = 0;
poptContext pc;
/*
- static BOOL show_all_parameters = False;
+ static int show_all_parameters = 0;
static char *new_local_machine = NULL;
*/
static const char *section_name = NULL;
@@ -90,7 +90,7 @@ static int do_global_checks(void)
struct poptOption long_options[] = {
POPT_AUTOHELP
- {"suppress-prompt", '\0', POPT_ARG_VAL, &silent_mode, 1, "Suppress prompt for enter"},
+ {"suppress-prompt", 0, POPT_ARG_NONE, &silent_mode, 1, "Suppress prompt for enter"},
{"verbose", 'v', POPT_ARG_NONE, &show_defaults, 1, "Show default options too"},
/*
We need support for smb.conf macros before this will work again
@@ -98,7 +98,7 @@ static int do_global_checks(void)
*/
/*
These are harder to do with the new code structure
- {"show-all-parameters", '\0', POPT_ARG_VAL, &show_all_parameters, True, "Show the parameters, type, possible values" },
+ {"show-all-parameters", '\0', POPT_ARG_NONE, &show_all_parameters, 1, "Show the parameters, type, possible values" },
*/
{"section-name", '\0', POPT_ARG_STRING, &section_name, 0, "Limit testparm to a named section" },
{"parameter-name", '\0', POPT_ARG_STRING, &parameter_name, 0, "Limit testparm to a named parameter" },