From nobody Mon Nov 17 13:42:39 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604508109; cv=none; d=zohomail.com; s=zohoarc; b=mA9Uh+3LP4j7dQBnUjGfRMcchawVj8oxfuvMp5Oq8mltZ7ThbqfghhDda4yPQVJptnnXQVWcM/LmBL3FFT3Y8WrX33F+JlxUjmxBa/tf5XJhc0byYc6K9twGoAIcxrWCY0UoXyHUMNPT8Yyde5H/XVoIEDCxBskjbHWrwdhLUi8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604508109; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=gqoekXM1BOzanoAnyeCgFyaEUXzrgeswDXKYIMHcmy4=; b=TVu6MNa+Z32uN0vcvhY1CS/KZ4CxY3KKslNMAMze7tbCZGa9n/TMuTVGdmlmHEGZbEDeNj/LUUwncSLbkb4QSPkyNMBGz5TmD++KZiRtJFZb4UZOCBBjUJ/QHedtju2awC+sEdFvS61KWokMhtNFp2UJKyrPzRJFX2phjGiDYfw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604508109810313.0392032435582; Wed, 4 Nov 2020 08:41:49 -0800 (PST) Received: from localhost ([::1]:58572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaLr2-0002dh-KX for importer@patchew.org; Wed, 04 Nov 2020 11:41:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaLpT-0001mk-Hz for qemu-devel@nongnu.org; Wed, 04 Nov 2020 11:40:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44039) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaLpO-0001iz-9n for qemu-devel@nongnu.org; Wed, 04 Nov 2020 11:40:09 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-194-KwXk7h_KMkmy0a5EnNIX5w-1; Wed, 04 Nov 2020 11:40:02 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 46431195CC41; Wed, 4 Nov 2020 16:40:00 +0000 (UTC) Received: from fedora.redhat.com (ovpn-112-222.ams2.redhat.com [10.36.112.222]) by smtp.corp.redhat.com (Postfix) with ESMTP id 155327512E; Wed, 4 Nov 2020 16:39:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604508004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gqoekXM1BOzanoAnyeCgFyaEUXzrgeswDXKYIMHcmy4=; b=db/ka8+zBsmx+zPqEj0Ec2V0xslYvPCM1Z3sRtooEKAHPCYbwq1DxkTxufnAQJA9nS5BJY OfWOTfjD+F1QTdZaMAG+KheKeWenEfrP3KHRZmvxeJvXitcbYW+M6NA2FUo+fvRdqHtTfi LtBll3AV8hV5i4DnKoM9rcN0ej9ddHc= X-MC-Unique: KwXk7h_KMkmy0a5EnNIX5w-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2] Prefer 'on' | 'off' over 'yes' | 'no' for bool options Date: Wed, 4 Nov 2020 16:39:56 +0000 Message-Id: <20201104163956.618571-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 22:09:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Markus Armbruster , Max Reitz , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Update some docs and test cases to use 'on' | 'off' as the preferred value for bool options. Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/system/vnc-security.rst | 10 +++++----- include/authz/listfile.h | 2 +- qemu-options.hx | 4 ++-- tests/qemu-iotests/233 | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/system/vnc-security.rst b/docs/system/vnc-security.rst index b237b07330..3574bdb86c 100644 --- a/docs/system/vnc-security.rst +++ b/docs/system/vnc-security.rst @@ -65,7 +65,7 @@ encrypted session. .. parsed-literal:: =20 |qemu_system| [...OPTIONS...] \ - -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Dno \ + -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Doff \ -vnc :1,tls-creds=3Dtls0 -monitor stdio =20 In the above example ``/etc/pki/qemu`` should contain at least three @@ -84,12 +84,12 @@ connecting. The server will request that the client pro= vide a certificate, which it will then validate against the CA certificate. This is a good choice if deploying in an environment with a private internal certificate authority. It uses the same syntax as previously, -but with ``verify-peer`` set to ``yes`` instead. +but with ``verify-peer`` set to ``on`` instead. =20 .. parsed-literal:: =20 |qemu_system| [...OPTIONS...] \ - -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Dyes \ + -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Don \ -vnc :1,tls-creds=3Dtls0 -monitor stdio =20 .. _vnc_005fsec_005fcertificate_005fpw: @@ -103,7 +103,7 @@ authentication to provide two layers of authentication = for clients. .. parsed-literal:: =20 |qemu_system| [...OPTIONS...] \ - -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Dyes \ + -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Don \ -vnc :1,tls-creds=3Dtls0,password -monitor stdio (qemu) change vnc password Password: ******** @@ -145,7 +145,7 @@ x509 options: .. parsed-literal:: =20 |qemu_system| [...OPTIONS...] \ - -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Dyes \ + -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Don \ -vnc :1,tls-creds=3Dtls0,sasl -monitor stdio =20 .. _vnc_005fsetup_005fsasl: diff --git a/include/authz/listfile.h b/include/authz/listfile.h index 0a1e5bddd3..0b7fe72198 100644 --- a/include/authz/listfile.h +++ b/include/authz/listfile.h @@ -73,7 +73,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(QAuthZListFile, * The object can be created on the command line using * * -object authz-list-file,id=3Dauthz0,\ - * filename=3D/etc/qemu/myvm-vnc.acl,refresh=3Dyes + * filename=3D/etc/qemu/myvm-vnc.acl,refresh=3Don * */ struct QAuthZListFile { diff --git a/qemu-options.hx b/qemu-options.hx index 2c83390504..0bdc07bc47 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -5002,7 +5002,7 @@ SRST Note the use of quotes due to the x509 distinguished name containing whitespace, and escaping of ','. =20 - ``-object authz-listfile,id=3Did,filename=3Dpath,refresh=3Dyes|no`` + ``-object authz-listfile,id=3Did,filename=3Dpath,refresh=3Don|off`` Create an authorization object that will control access to network services. =20 @@ -5047,7 +5047,7 @@ SRST =20 # |qemu_system| \\ ... \\ - -object authz-simple,id=3Dauth0,filename=3D/etc/qemu/vnc-= sasl.acl,refresh=3Dyes \\ + -object authz-simple,id=3Dauth0,filename=3D/etc/qemu/vnc-= sasl.acl,refresh=3Don \\ ... =20 ``-object authz-pam,id=3Did,service=3Dstring`` diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233 index a5c17c3963..0b99530f7f 100755 --- a/tests/qemu-iotests/233 +++ b/tests/qemu-iotests/233 @@ -83,7 +83,7 @@ echo echo "=3D=3D check plain client to TLS server fails =3D=3D" =20 nbd_server_start_tcp_socket \ - --object tls-creds-x509,dir=3D${tls_dir}/server1,endpoint=3Dserver,id= =3Dtls0,verify-peer=3Dyes \ + --object tls-creds-x509,dir=3D${tls_dir}/server1,endpoint=3Dserver,id= =3Dtls0,verify-peer=3Don \ --tls-creds tls0 \ -f $IMGFMT "$TEST_IMG" 2>> "$TEST_DIR/server.log" =20 @@ -128,7 +128,7 @@ echo "=3D=3D check TLS with authorization =3D=3D" nbd_server_stop =20 nbd_server_start_tcp_socket \ - --object tls-creds-x509,dir=3D${tls_dir}/server1,endpoint=3Dserver,id= =3Dtls0,verify-peer=3Dyes \ + --object tls-creds-x509,dir=3D${tls_dir}/server1,endpoint=3Dserver,id= =3Dtls0,verify-peer=3Don \ --object "authz-simple,id=3Dauthz0,identity=3DCN=3Dlocalhost,, \ O=3DCthulu Dark Lord Enterprises client1,,L=3DR'lyeh,,C=3DSouth Paci= fic" \ --tls-authz authz0 \ --=20 2.28.0