40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
|
From fe9f75a69b6dac1dec4f77d8b17ec2406415d89d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matt Coleman <mcoleman@datto.com>
|
||
|
|
Date: Mon, 21 Sep 2020 22:01:46 -0400
|
||
|
|
Subject: [PATCH 037/108] libvirt: ensure defresult is used in
|
||
|
|
virConnectAuthCallbackDefault
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
A previous change to this function's password handling broke the use of
|
||
|
|
default values for credential types other than VIR_CRED_PASSPHRASE and
|
||
|
|
VIR_CRED_NOECHOPROMPT.
|
||
|
|
|
||
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||
|
|
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
|
||
|
|
Signed-off-by: Matt Coleman <matt@datto.com>
|
||
|
|
(cherry picked from commit 1bb9f872a02f8be50c8f98b0ad13de62d2986fa9)
|
||
|
|
---
|
||
|
|
src/libvirt.c | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/libvirt.c b/src/libvirt.c
|
||
|
|
index 76bf1fa677..b11a15d7fe 100644
|
||
|
|
--- a/src/libvirt.c
|
||
|
|
+++ b/src/libvirt.c
|
||
|
|
@@ -146,7 +146,9 @@ virConnectAuthCallbackDefault(virConnectCredentialPtr cred,
|
||
|
|
len = strlen(buf);
|
||
|
|
if (len != 0 && buf[len-1] == '\n')
|
||
|
|
buf[len-1] = '\0';
|
||
|
|
- bufptr = g_strdup(buf);
|
||
|
|
+
|
||
|
|
+ if (strlen(buf) > 0)
|
||
|
|
+ bufptr = g_strdup(buf);
|
||
|
|
break;
|
||
|
|
|
||
|
|
case VIR_CRED_PASSPHRASE:
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|