From: Andreas Schneider Date: Thu, 8 Mar 2018 14:40:56 +0000 (+0100) Subject: wbinfo: Improve the wording for --online-status X-Git-Tag: talloc-2.1.12~146 X-Git-Url: http://git.samba.org/samba.git/?p=nivanova%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=03617480d121232c06ce5887947326f3c92625eb wbinfo: Improve the wording for --online-status Currently it displays if a domain is online or offline which is wrong. It tells us if we maintain an active connection to the domain or not. Users are confused if they read offline because the think winbind is not functional with that domain. Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Fri Mar 16 14:46:43 CET 2018 on sn-devel-144 --- diff --git a/docs-xml/manpages/wbinfo.1.xml b/docs-xml/manpages/wbinfo.1.xml index e2042ca623a..21e3ac9fbf9 100644 --- a/docs-xml/manpages/wbinfo.1.xml +++ b/docs-xml/manpages/wbinfo.1.xml @@ -346,9 +346,10 @@ --online-status domain - Show whether domains are marked as online or - offline. An optional domain argument limits the - output to the online status of a given domain. + Display whether winbind currently maintains an + active connection or not. An optional domain + argument limits the output to the online status + of a given domain. diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c index 82863c26760..1b58c73602a 100644 --- a/nsswitch/wbinfo.c +++ b/nsswitch/wbinfo.c @@ -640,7 +640,7 @@ static bool wbinfo_show_onlinestatus(const char *domain) d_printf("%s : %s\n", domain_list[i].short_name, - is_offline ? "offline" : "online" ); + is_offline ? "no active connection" : "active connection" ); } wbcFreeMemory(domain_list); @@ -2336,7 +2336,7 @@ int main(int argc, const char **argv, char **envp) { "all-domains", 0, POPT_ARG_NONE, 0, OPT_LIST_ALL_DOMAINS, "List all domains (trusted and own domain)" }, { "own-domain", 0, POPT_ARG_NONE, 0, OPT_LIST_OWN_DOMAIN, "List own domain" }, { "sequence", 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, "Deprecated command, see --online-status" }, - { "online-status", 0, POPT_ARG_NONE, 0, OPT_ONLINESTATUS, "Show whether domains are marked as online or offline"}, + { "online-status", 0, POPT_ARG_NONE, 0, OPT_ONLINESTATUS, "Show whether domains maintain an active connection"}, { "domain-info", 'D', POPT_ARG_STRING, &string_arg, 'D', "Show most of the info we have about the domain" }, { "user-info", 'i', POPT_ARG_STRING, &string_arg, 'i', "Get user info", "USER" }, { "uid-info", 0, POPT_ARG_INT, &int_arg, OPT_UID_INFO, "Get user info from uid", "UID" },