summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-01-14 10:47:56 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-01-14 10:47:56 +0000
commit619f9400c065a1f01cc6083e7b25619120bbd15b (patch)
tree75253f6dd7eec01e1c2523ec8ca954f043e165fb /source3/utils
parentf9c61aef05fefe6f78d55b0a9c62e76b6172294e (diff)
downloadsamba-619f9400c065a1f01cc6083e7b25619120bbd15b.tar.gz
samba-619f9400c065a1f01cc6083e7b25619120bbd15b.tar.bz2
samba-619f9400c065a1f01cc6083e7b25619120bbd15b.zip
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)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/testparm.c3
1 files changed, 2 insertions, 1 deletions
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}
};