From 619f9400c065a1f01cc6083e7b25619120bbd15b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 14 Jan 2003 10:47:56 +0000 Subject: Merge from HEAD - patch by metze to fill in 'workgroup' etc in testparm output, and probably SWAT too.. Andrew Bartlett (This used to be commit 1df808ac8931979000d681bd086399ef306873b6) --- source3/utils/testparm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/utils/testparm.c') diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index 95c4b2b265..36b2bdfc6d 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -190,7 +190,7 @@ int main(int argc, const char *argv[]) int ret = 0; int opt; poptContext pc; - static char *term_code = ""; + static const char *term_code = ""; static char *new_local_machine = NULL; const char *cname; const char *caddr; @@ -202,6 +202,7 @@ int main(int argc, const char *argv[]) {"verbose", 'v', POPT_ARG_NONE, &show_defaults, 1, "Show default options too"}, {"server", 'L',POPT_ARG_STRING, &new_local_machine, 0, "Set %%L macro to servername\n"}, {"encoding", 't', POPT_ARG_STRING, &term_code, 0, "Print parameters with encoding"}, + {NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version}, {0,0,0,0} }; -- cgit