From nobody Sun Oct 5 19:22:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542650425844356.3928019122309; Mon, 19 Nov 2018 10:00:25 -0800 (PST) Received: from localhost ([::1]:58335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOnqS-0004za-OO for importer@patchew.org; Mon, 19 Nov 2018 13:00:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOnkx-0008VW-Ky for qemu-devel@nongnu.org; Mon, 19 Nov 2018 12:54:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOnkw-0002WB-Kz for qemu-devel@nongnu.org; Mon, 19 Nov 2018 12:54:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41252) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gOnku-0002SL-Iv; Mon, 19 Nov 2018 12:54:40 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E3AA7307C943; Mon, 19 Nov 2018 17:54:39 +0000 (UTC) Received: from red.redhat.com (ovpn-121-142.rdu2.redhat.com [10.10.121.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CC6C5C57B; Mon, 19 Nov 2018 17:54:39 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 11:54:19 -0600 Message-Id: <20181119175427.2298497-5-eblake@redhat.com> In-Reply-To: <20181119175427.2298497-1-eblake@redhat.com> References: <20181119175427.2298497-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 19 Nov 2018 17:54:39 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 04/12] nbd: fix whitespace in server error message X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:Network Block Dev..." Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Daniel P. Berrang=C3=A9 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 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=C3=A9 Message-Id: <20181116155325.22428-2-berrange@redhat.com> Reviewed-by: Eric Blake [eblake: move lone space to next line] Signed-off-by: Eric Blake --- 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, u= int16_t myflags, default: ret =3D 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. */ --=20 2.17.2