Merge: add popt_common_version to command line options table.

(This used to be commit 8de62f7896a53084e87b95c013d8693214c8ab85)

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/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}
        };