[PATCH] fix wbinfo -m --verbose trust type "Local"
Ralph Böhme
slow at samba.org
Thu Mar 1 10:48:47 UTC 2018
Hi!
Just stumbled across a simple bug in wbinfo -m --verbose. Patch attached, please
review & push if ok.
-slow
--
Ralph Boehme, Samba Team https://samba.org/
Samba Developer, SerNet GmbH https://sernet.de/en/samba/
GPG Key Fingerprint: FAE2 C608 8A24 2520 51C5 59E4 AA1E 9B71 2639 9E46
-------------- next part --------------
From b54270bc526feea71ce4eeb4b577f0d236448f3d Mon Sep 17 00:00:00 2001
From: Ralph Boehme <slow at samba.org>
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 <slow at samba.org>
---
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
More information about the samba-technical
mailing list