summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2003-02-18 18:43:59 +0000
committerJelmer Vernooij <jelmer@samba.org>2003-02-18 18:43:59 +0000
commit5eb7b6113b8d4b59de5177e8b1485dc0c3ae19db (patch)
tree4749bbc3ddc07f5faa1d4e18194e2162d14ceb29
parentc536b88b2b71c264a1e31ada51e463fee5cb949b (diff)
downloadsamba-5eb7b6113b8d4b59de5177e8b1485dc0c3ae19db.tar.gz
samba-5eb7b6113b8d4b59de5177e8b1485dc0c3ae19db.tar.bz2
samba-5eb7b6113b8d4b59de5177e8b1485dc0c3ae19db.zip
Add -V option (to print out version) to utilities where possible
(pdbedit already has a -V option..) (This used to be commit 5de622968d95c1436dbd34edc8d0a9bbff68916b)
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/nsswitch/wbinfo.c1
-rw-r--r--source3/rpcclient/rpcclient.c1
-rw-r--r--source3/rpcclient/samsync.c1
-rw-r--r--source3/torture/samtest.c1
-rw-r--r--source3/torture/vfstest.c1
-rw-r--r--source3/utils/net.c1
-rw-r--r--source3/utils/ntlm_auth.c1
-rw-r--r--source3/utils/status.c1
9 files changed, 9 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index bd41d9636c..e04550cf21 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -597,7 +597,7 @@ WINBINDD_OBJ = \
$(PROFILE_OBJ) $(UNIGRP_OBJ) \
$(SECRETS_OBJ) $(LIBADS_OBJ) $(KRBCLIENT_OBJ)
-WBINFO_OBJ = nsswitch/wbinfo.o libsmb/smbencrypt.o libsmb/smbdes.o
+WBINFO_OBJ = nsswitch/wbinfo.o libsmb/smbencrypt.o libsmb/smbdes.o $(POPT_LIB_OBJ)
WINBIND_NSS_OBJ = nsswitch/winbind_nss.o nsswitch/wb_common.o @WINBIND_NSS_EXTRA_OBJS@
diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c
index f03b0493de..68dc178bcd 100644
--- a/source3/nsswitch/wbinfo.c
+++ b/source3/nsswitch/wbinfo.c
@@ -711,6 +711,7 @@ int main(int argc, char **argv)
{ "set-auth-user", 'A', POPT_ARG_STRING, &string_arg, OPT_SET_AUTH_USER, "Store user and password used by winbindd (root only)", "user%password" },
{ "get-auth-user", 0, POPT_ARG_NONE, NULL, OPT_GET_AUTH_USER, "Retrieve user and password used by winbindd (root only)", NULL },
{ "ping", 'p', POPT_ARG_NONE, 0, 'p', "'ping' winbindd to see if it is alive" },
+ { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
{ 0, 0, 0, 0 }
};
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 81bb62486a..37ce597d4e 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -585,6 +585,7 @@ out_free:
{"dest-ip", 'I', POPT_ARG_STRING, &opt_ipaddr, 'I', "Specify destination IP address", "IP"},
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile },
+ { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
{ NULL }
};
diff --git a/source3/rpcclient/samsync.c b/source3/rpcclient/samsync.c
index f941d70e5e..a4061d2a87 100644
--- a/source3/rpcclient/samsync.c
+++ b/source3/rpcclient/samsync.c
@@ -632,6 +632,7 @@ struct poptOption popt_common_interactive[] = {
"Replicate SAM changes" },
{ "serial", 0, POPT_ARG_INT, &serial, 0, "SAM serial number" },
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
+ { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_auth_info },
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_interactive },
POPT_AUTOHELP
diff --git a/source3/torture/samtest.c b/source3/torture/samtest.c
index 17444c0757..a1ccec098b 100644
--- a/source3/torture/samtest.c
+++ b/source3/torture/samtest.c
@@ -369,6 +369,7 @@ int main(int argc, char *argv[])
{"command", 'e', POPT_ARG_STRING, &cmdstr, 'e', "Execute semicolon seperated cmds"},
{"logfile", 'l', POPT_ARG_STRING, &opt_logfile, 'l', "Logfile to use instead of stdout"},
{"configfile", 'c', POPT_ARG_STRING, &config_file, 0,"use different configuration file",NULL},
+ { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
{ 0, 0, 0, 0}
};
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 78d22a07ac..fef189844b 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -495,6 +495,7 @@ int main(int argc, char *argv[])
{"command", 'c', POPT_ARG_STRING, &cmdstr, 0, "Execute specified list of commands" },
{"logfile", 'l', POPT_ARG_STRING, &opt_logfile, 'l', "Write output to specified logfile" },
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
+ { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
{ 0, 0, 0, 0}
};
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 33195375f5..ada0ed53e1 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -537,6 +537,7 @@ static struct functable net_func[] = {
{"timeout", 't', POPT_ARG_INT, &opt_timeout},
{"machine-pass",'P', POPT_ARG_NONE, &opt_machine_pass},
{"debuglevel", 'd', POPT_ARG_STRING, &debuglevel},
+ {NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
{ 0, 0, 0, 0}
};
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 9e4318def3..b76308c55f 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -466,6 +466,7 @@ int main(int argc, const char **argv)
{ "password", 0, POPT_ARG_STRING, &password, OPT_PASSWORD, "User's plaintext password"},
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile },
+ { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
{ 0, 0, 0, 0 }
};
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 094dc0ff1c..8014b133d9 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -560,6 +560,7 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
#endif /* WITH_PROFILE */
{"byterange", 'B', POPT_ARG_NONE, &show_brl, 'B', "Include byte range locks"},
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
+ { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile },
{ 0, 0, 0, 0}
};