30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
|
From 7214a7e3a60c628575a73dab0437e065b9e9a32a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Pavel Zhukov <pzhukov@redhat.com>
|
||
|
|
Date: Tue, 27 Feb 2018 09:48:13 +0100
|
||
|
|
Subject: [PATCH] Check if mechlist buffer is not empty
|
||
|
|
|
||
|
|
Check if mechlist is null is redundant because it's initialized in
|
||
|
|
ask_capabilities flow. As the result some capabilities may be lost and
|
||
|
|
reported as not advertised
|
||
|
|
Keeping (now reduntant) null check to avoid regressions in the future
|
||
|
|
This is regression in 9fd201ba2b4ab58eda3372fb6765e1d5d8f027b4
|
||
|
|
|
||
|
|
Bug-Url: https://bugzilla.redhat.com/1543481
|
||
|
|
---
|
||
|
|
imtest/imtest.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/imtest/imtest.c b/imtest/imtest.c
|
||
|
|
index 716e2b252..85f4cc5ce 100644
|
||
|
|
--- a/imtest/imtest.c
|
||
|
|
+++ b/imtest/imtest.c
|
||
|
|
@@ -3084,7 +3084,7 @@ int main(int argc, char **argv)
|
||
|
|
/* try to get the capabilities from the banner */
|
||
|
|
mechlist = ask_capability(protocol, servername,
|
||
|
|
&capabilities, AUTO_BANNER);
|
||
|
|
- if (!mechlist && !(capabilities & CAPA_STARTTLS)) {
|
||
|
|
+ if ((!mechlist || !buf_len(mechlist)) && !(capabilities & CAPA_STARTTLS)) {
|
||
|
|
/* found no capabilities in banner -> get them explicitly */
|
||
|
|
protocol->banner.is_capa = 0;
|
||
|
|
}
|