Add -V option (to print out version) to utilities where possible

(pdbedit already has a -V option..)
(This used to be commit 5de622968d95c1436dbd34edc8d0a9bbff68916b)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index bd41d9636cb09af0a489eb5b6373b8e369d12f25..e04550cf21724086679ca34318bea7fa58580b35 100644 (file)
--- 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 f03b0493def0c3f1ae83c6e806abeed5693685c8..68dc178bcdbe48cce6963b91df97eb78ad00cdc7 100644 (file)
--- 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 81bb62486a17d8098334cac9ace6799a9302deb8..37ce597d4ecffc7583610474bba1d0fca6b4447e 100644 (file)
--- 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 f941d70e5ee7a9182c0dc52a006039ef83e6ed93..a4061d2a872dd7e20ee4615428edd1130dc14fae 100644 (file)
--- 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 17444c0757bb60eb33e6e181bbccae80fa4ab5dc..a1ccec098b7f574ba39c8f50cc78c883dd8d2de2 100644 (file)
--- 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 78d22a07ac4146bf8f22da7586d4c750c6904bfd..fef189844bc7867672e3cfa183c0042535dec9dc 100644 (file)
--- 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 33195375f598efa709f1e9bf361e08b9a4fa19e5..ada0ed53e130de7d46ff3ad5bcbfb489699a59cb 100644 (file)
--- 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 9e4318def3666d4557acb36a771d8901b499288c..b76308c55fb0103edfc6bbfa181004510c015870 100644 (file)
--- 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 094dc0ff1c7f7d1fded2eaf96f058d789873f2b5..8014b133d9e9decb0f9ed5f76f7a1d45f4a4fc55 100644 (file)
--- 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}
        };