From fb52867f84e8f7c18c95e22c6f8d7f5d1961028c Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Thu, 1 Mar 2018 11:43:39 +0100 Subject: [PATCH] nsswitch: fix wbinfo -m --verbose trust type "Local" Remove wrong "Local" strcmp(), there's another one, the correct one, a few lines below. Since commit 95e3307917b5731ab883ee5fce530c5b559b4934 WBC_DOMINFO_TRUSTTYPE_NONE, which corresponded to the string "None" in the winbindd response, is not used anymore. Bug: https://bugzilla.samba.org/show_bug.cgi?id=13313 Signed-off-by: Ralph Boehme Reviewed-by: Stefan Metzmacher Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Mar 2 05:49:18 CET 2018 on sn-devel-144 (cherry picked from commit f59f6cefa11c4866d2ede47d9c9b415e3d5e233d) --- nsswitch/libwbclient/wbc_util.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nsswitch/libwbclient/wbc_util.c b/nsswitch/libwbclient/wbc_util.c index ecfcaa0fb60..fc6a840cc71 100644 --- a/nsswitch/libwbclient/wbc_util.c +++ b/nsswitch/libwbclient/wbc_util.c @@ -455,9 +455,7 @@ static wbcErr process_domain_info_string(struct wbcDomainInfo *info, *s = '\0'; s++; - if (strcmp(r, "Local") == 0) { - info->trust_type = WBC_DOMINFO_TRUSTTYPE_NONE; - } else if (strncmp(r, "Routed", strlen("Routed")) == 0) { + if (strncmp(r, "Routed", strlen("Routed")) == 0) { info->trust_type = WBC_DOMINFO_TRUSTTYPE_NONE; info->trust_routing = strdup(r); BAIL_ON_PTR_ERROR(info->trust_routing, wbc_status); -- 2.13.6