|
 |
7711c0 |
From 344f6a6e7dbdd6aae5d3564e46ade0970246eaca Mon Sep 17 00:00:00 2001
|
|
|
7711c0 |
From: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Date: Fri, 22 Mar 2019 03:22:29 +0100
|
|
|
7711c0 |
Subject: [PATCH 062/163] nbd: fix whitespace in server error message
|
|
|
7711c0 |
MIME-Version: 1.0
|
|
|
7711c0 |
Content-Type: text/plain; charset=UTF-8
|
|
|
7711c0 |
Content-Transfer-Encoding: 8bit
|
|
|
7711c0 |
|
|
|
7711c0 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Message-id: <20190322032241.8111-17-jsnow@redhat.com>
|
|
|
7711c0 |
Patchwork-id: 85107
|
|
|
7711c0 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 16/28] nbd: fix whitespace in server error message
|
|
|
7711c0 |
Bugzilla: 1691563
|
|
|
7711c0 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
From: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
A space was missing after the option number was printed:
|
|
|
7711c0 |
|
|
|
7711c0 |
Option 0x8not permitted before TLS
|
|
|
7711c0 |
|
|
|
7711c0 |
becomes
|
|
|
7711c0 |
|
|
|
7711c0 |
Option 0x8 not permitted before TLS
|
|
|
7711c0 |
|
|
|
7711c0 |
This fixes
|
|
|
7711c0 |
|
|
|
7711c0 |
commit 3668328303429f3bc93ab3365c66331600b06a2d
|
|
|
7711c0 |
Author: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
Date: Fri Oct 14 13:33:09 2016 -0500
|
|
|
7711c0 |
|
|
|
7711c0 |
nbd: Send message along with server NBD_REP_ERR errors
|
|
|
7711c0 |
|
|
|
7711c0 |
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
7711c0 |
Message-Id: <20181116155325.22428-2-berrange@redhat.com>
|
|
|
7711c0 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
[eblake: move lone space to next line]
|
|
|
7711c0 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
(cherry picked from commit 0b0bb124bb797b2fc3389ffa1e933fc34fe6dacb)
|
|
|
7711c0 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
---
|
|
|
7711c0 |
nbd/server.c | 2 +-
|
|
|
7711c0 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7711c0 |
|
|
|
7711c0 |
diff --git a/nbd/server.c b/nbd/server.c
|
|
|
7711c0 |
index d414861..418b1d4 100644
|
|
|
7711c0 |
--- a/nbd/server.c
|
|
|
7711c0 |
+++ b/nbd/server.c
|
|
|
7711c0 |
@@ -1136,7 +1136,7 @@ static int nbd_negotiate_options(NBDClient *client, uint16_t myflags,
|
|
|
7711c0 |
default:
|
|
|
7711c0 |
ret = nbd_opt_drop(client, NBD_REP_ERR_TLS_REQD, errp,
|
|
|
7711c0 |
"Option 0x%" PRIx32
|
|
|
7711c0 |
- "not permitted before TLS", option);
|
|
|
7711c0 |
+ " not permitted before TLS", option);
|
|
|
7711c0 |
/* Let the client keep trying, unless they asked to
|
|
|
7711c0 |
* quit. In this mode, we've already sent an error, so
|
|
|
7711c0 |
* we can't ack the abort. */
|
|
|
7711c0 |
--
|
|
|
7711c0 |
1.8.3.1
|
|
|
7711c0 |
|