summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-02-25 23:54:23 +0000
committerTim Potter <tpot@samba.org>2003-02-25 23:54:23 +0000
commita03c5f23949f9782a42934eedaab004acdaf2d81 (patch)
tree1bcf0a04979d2da426769e8eaf87e413af915ff2 /source3
parent130d49aa6bf463e53cf6d01900d4f50fba8c358c (diff)
downloadsamba-a03c5f23949f9782a42934eedaab004acdaf2d81.tar.gz
samba-a03c5f23949f9782a42934eedaab004acdaf2d81.tar.bz2
samba-a03c5f23949f9782a42934eedaab004acdaf2d81.zip
Merge: add popt_common_version to command line options table.
(This used to be commit 8de62f7896a53084e87b95c013d8693214c8ab85)
Diffstat (limited to 'source3')
-rw-r--r--source3/nsswitch/wbinfo.c1
-rw-r--r--source3/utils/net.c1
-rw-r--r--source3/utils/ntlm_auth.c1
-rw-r--r--source3/utils/status.c1
4 files changed, 4 insertions, 0 deletions
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/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}
};