From nobody Tue Sep 9 19:27:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1753104514; cv=none; d=zohomail.com; s=zohoarc; b=VkEZ6Kl8YPytwiOTsWr5Q6UIZFeGEk8+vE/3CpyyQatRv6Szh1SenSamO8nyGFjlGXex3FM5hXUfXkC/NUQy7JUAMTXbtFYHNMqoFpVem7XA9baHN7RkiCDcPy/hwbDg5GR960zOPBCHfURIGCrbf7D47Beu3hQC2we01bbW+HE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753104514; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=IjZAjdA3UmHbhy+ceH1lcPusa5sK3ChjBF8PYxyzOsw=; b=W1hzEp7QaaDO6/e4n9TIAP0YPi1gFq6ouSECL7le2JDYVOPA2NMgXrUYe7pQ+JdvlGdGW+CCbu05JhPV1oJHBxWPhuwTm1pAsS9MsxlZIYwaNkDFqMNi53VHs+UXnWZEph/1S2xLjv9o02CFycUyloyuFYPVbgYxfvwdbOkI1jk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1753104514906896.6702676181454; Mon, 21 Jul 2025 06:28:34 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E64679D2; Mon, 21 Jul 2025 09:28:33 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 800C71529; Mon, 21 Jul 2025 09:22:05 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9880F11CD; Mon, 21 Jul 2025 09:21:50 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 30F7E146A for ; Mon, 21 Jul 2025 09:21:32 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-564-BG_PGMcKOLe3lcaSSlJhFQ-1; Mon, 21 Jul 2025 09:21:27 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4F2F01944D04 for ; Mon, 21 Jul 2025 13:21:26 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.25]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 932FE1800D82 for ; Mon, 21 Jul 2025 13:21:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1753104091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lX9w+YoAW1e8iJrXXa3PghudoEHSeGHmdpJCDjMWq+E=; b=Tnc3jzZG6IOxFjN9EJ0hSpeXAVpY5rDHYO0H5IrBmjNgCV+nLKB7ftGS1LrlfrIgSwRnSW U0WXkrsd/1xln+Qr7tH3SRRxzBo/lekIGhrzjwbGMEkQCLoF1n625X2qCOAlHktyTkKXYc rf616IJzu/tH057HZpKKevHXTb2w3zk= X-MC-Unique: BG_PGMcKOLe3lcaSSlJhFQ-1 X-Mimecast-MFC-AGG-ID: BG_PGMcKOLe3lcaSSlJhFQ_1753104086 To: devel@lists.libvirt.org Subject: [PATCH 19/19] virSecuritySELinuxGetSecurityMountOptions: refactor printing Date: Mon, 21 Jul 2025 15:21:00 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: nt-hY9Eh2ioa3uZje--OnMef90YxCdfBqruolzmcwFw_1753104086 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: BIT2TWQ5SHP5YFVSC3AI2WIHCPP6UXMD X-Message-ID-Hash: BIT2TWQ5SHP5YFVSC3AI2WIHCPP6UXMD X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1753104516930116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Fix linebreaks and remove the use of ternary operator. Signed-off-by: Peter Krempa --- src/security/security_selinux.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 9d14e33340..fa5d1568eb 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -3526,23 +3526,24 @@ virSecuritySELinuxGetSecurityMountOptions(virSecuri= tyManager *mgr, { char *opts =3D NULL; virSecurityLabelDef *secdef; + const char *imagelabel =3D NULL; if ((secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_= NAME))) { if (!secdef->imagelabel) secdef->imagelabel =3D virSecuritySELinuxGenImageLabel(mgr, de= f); if (secdef->imagelabel) { - opts =3D g_strdup_printf( - ",context=3D\"%s\"", + opts =3D g_strdup_printf(",context=3D\"%s\"", (const char*) secdef->imagelabel); } + + imagelabel =3D secdef->imagelabel; } if (!opts) opts =3D g_strdup(""); - VIR_DEBUG("imageLabel=3D%s opts=3D%s", - secdef ? secdef->imagelabel : "(null)", opts); + VIR_DEBUG("imageLabel=3D%s opts=3D%s", NULLSTR(imagelabel), opts); return opts; } --=20 2.50.0