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.

diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 801f92f7abd7ba00b2cbe7941e2c646fe4cb82bb..6ff66f8f3ccd42a6810952f7a7ada2f24948f9b0 100644 (file)
--- 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;