summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-12-04 18:43:27 +0100
committerVolker Lendecke <vlendec@samba.org>2010-12-19 23:25:06 +0100
commitaf4a5f4c13a60e1522c05663cc00dc339b6150ed (patch)
tree39d510108f2f058ce415b2af86e3a2060f3dbda7
parentd60d49efb06475a3994fa65d17a72a2b930b20d4 (diff)
downloadsamba-af4a5f4c13a60e1522c05663cc00dc339b6150ed.tar.gz
samba-af4a5f4c13a60e1522c05663cc00dc339b6150ed.tar.bz2
samba-af4a5f4c13a60e1522c05663cc00dc339b6150ed.zip
s3: Add -P as an alias for --ping-dc
This is a much less intrusive version of the DC connectivity check than wbinfo -t is. Make it simple to use.
-rw-r--r--nsswitch/wbinfo.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 801f92f7ab..6ff66f8f3c 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -1940,7 +1940,6 @@ enum {
OPT_VERBOSE,
OPT_ONLINESTATUS,
OPT_CHANGE_USER_PASSWORD,
- OPT_PING_DC,
OPT_CCACHE_SAVE,
OPT_SID_TO_FULLNAME,
OPT_NTLMV2,
@@ -1997,7 +1996,7 @@ int main(int argc, char **argv, char **envp)
{ "remove-gid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_REMOVE_GID_MAPPING, "Remove gid to sid mapping in idmap", "GID,SID" },
{ "check-secret", 't', POPT_ARG_NONE, 0, 't', "Check shared secret" },
{ "change-secret", 'c', POPT_ARG_NONE, 0, 'c', "Change shared secret" },
- { "ping-dc", 0, POPT_ARG_NONE, 0, OPT_PING_DC,
+ { "ping-dc", 'P', POPT_ARG_NONE, 0, 'P',
"Check the NETLOGON connection" },
{ "trusted-domains", 'm', POPT_ARG_NONE, 0, 'm', "List trusted domains" },
{ "all-domains", 0, POPT_ARG_NONE, 0, OPT_LIST_ALL_DOMAINS, "List all domains (trusted and own domain)" },
@@ -2246,7 +2245,7 @@ int main(int argc, char **argv, char **envp)
goto done;
}
break;
- case OPT_PING_DC:
+ case 'P':
if (!wbinfo_ping_dc()) {
d_fprintf(stderr, "Could not ping our DC\n");
goto done;