[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/12] nbd: fix whitespace in server error message
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PULL 04/12] nbd: fix whitespace in server error message |
Date: |
Mon, 19 Nov 2018 11:54:19 -0600 |
From: Daniel P. Berrangé <address@hidden>
A space was missing after the option number was printed:
Option 0x8not permitted before TLS
becomes
Option 0x8 not permitted before TLS
This fixes
commit 3668328303429f3bc93ab3365c66331600b06a2d
Author: Eric Blake <address@hidden>
Date: Fri Oct 14 13:33:09 2016 -0500
nbd: Send message along with server NBD_REP_ERR errors
Signed-off-by: Daniel P. Berrangé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[eblake: move lone space to next line]
Signed-off-by: Eric Blake <address@hidden>
---
nbd/server.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nbd/server.c b/nbd/server.c
index 4e8f5ae51b0..056cfa5ad47 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -1136,7 +1136,7 @@ static int nbd_negotiate_options(NBDClient *client,
uint16_t myflags,
default:
ret = nbd_opt_drop(client, NBD_REP_ERR_TLS_REQD, errp,
"Option 0x%" PRIx32
- "not permitted before TLS", option);
+ " not permitted before TLS", option);
/* Let the client keep trying, unless they asked to
* quit. In this mode, we've already sent an error, so
* we can't ack the abort. */
--
2.17.2
- [Qemu-devel] [PULL 00/12] NBD patches for 3.1-rc2, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 02/12] qemu-iotests: convert `pwd` and $(pwd) to $PWD, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 04/12] nbd: fix whitespace in server error message,
Eric Blake <=
- [Qemu-devel] [PULL 06/12] io: return 0 for EOF in TLS session read after shutdown, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 03/12] qemu-iotests: Modern shell scripting (use $() instead of ``), Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 05/12] nbd/server: Ignore write errors when replying to NBD_OPT_ABORT, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 09/12] tests: add iotests helpers for dealing with TLS certificates, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 08/12] tests: check if qemu-nbd is still alive before waiting, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 07/12] tests: pull qemu-nbd iotest helpers into common.nbd file, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 11/12] iotests: Also test I/O over NBD TLS, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 10/12] tests: exercise NBD server in TLS mode, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 12/12] iotests: Drop use of bash keyword 'function', Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 01/12] qemu-iotests: remove unused variable 'here', Eric Blake, 2018/11/19