From nobody Tue Feb 10 02:28:05 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1624450737218877.1756485161776; Wed, 23 Jun 2021 05:18:57 -0700 (PDT) Received: from localhost ([::1]:33824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lw1qK-0003CE-6q for importer@patchew.org; Wed, 23 Jun 2021 08:18:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lw1m6-0003vh-Lr for qemu-devel@nongnu.org; Wed, 23 Jun 2021 08:14:34 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]:34556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lw1m4-000223-Gz for qemu-devel@nongnu.org; Wed, 23 Jun 2021 08:14:34 -0400 Received: by mail-ed1-x52e.google.com with SMTP id i5so3189394eds.1 for ; Wed, 23 Jun 2021 05:14:32 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o5sm1680778edt.44.2021.06.23.05.14.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 05:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wdNBBsrW5vIL9utRkwMG1tSad8yWDV0BnIWqmy35G8s=; b=iVVyoTgyOEGcfBnP8byUhqjaNaImzxrvEe4DXfJU8bN7CMB0ANPnxJqUvCtY3GzBKw 3L0m+ZxbHnxKfaX5aZ30OOgsHN/7VB6gU3oGYyWUK8LjB6Anm8G1Ou4P5BP64KME5fyh EX49n6aiGlQXj4hJtpPTGTyCTbfxuW7IG3Gi3Ffk2zxR1uq5Ih88dx1Eh5jDhuQQAIXX vh82mTemZr7sFC7Mi5k/eNjRikRcd2LqR1RoYhnceS94w0fBOs1CHD08dQFWk6lPuHzy WsukHrTa33sRHOzHALiuImaoP/RmfGp/9ed/b+3FPCKIJWW/tWjaPmXZBeadkXSNR741 gzwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wdNBBsrW5vIL9utRkwMG1tSad8yWDV0BnIWqmy35G8s=; b=StX14Y5BDPnB1Nf2R4b9vr91YyFuEoF2TS3M9+KMj3eIRfhInmohozxmVI/lW4mEkq dsc6uxj1Fhogu/w+/PG5aBk7Tr2FwGInOCQIKCdIhCm8ix107CeTiQgKpHkrQeQ/lily wJiPZJXgraMBzYH91PF34SYhoti7COhAFeI84UAY1ivGOGxKYwGUhLiN+t5Sxf+cfJAV nu3/FJa6LVVwbmnPKFjkU/39y05D7XG8eVR1sm/0p4LRxPKyDp2obGGlRQWfzOSwd65V j0ql3mqMK7a9Xd3g3eqGUzjUPQGRjq+g1XUrfBJ6Fo8/K5CunaVYm0ZF4rcmQ5cHgsor DPQw== X-Gm-Message-State: AOAM531R6CxKMk7z97beUIIn6g7inifKH9mr8ruHZAq796weAAf4RLSj /zTbeMkpBanvV/+EdAKHgZmrAfps7Pc= X-Google-Smtp-Source: ABdhPJyq1IizHFcOP+PA/wSNgGbOBcWCT0psv+6sfClJ/ldUyPc1HaSm4iyIruvwuyoaEydsZI7sqQ== X-Received: by 2002:aa7:d818:: with SMTP id v24mr11734367edq.22.1624450471098; Wed, 23 Jun 2021 05:14:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/12] configure, meson: convert pam detection to meson Date: Wed, 23 Jun 2021 14:14:20 +0200 Message-Id: <20210623121424.1259496-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210623121424.1259496-1-pbonzini@redhat.com> References: <20210623121424.1259496-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::52e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- authz/meson.build | 2 +- configure | 38 ++++---------------------------------- meson.build | 30 +++++++++++++++++++++++++----- meson_options.txt | 2 ++ tests/unit/meson.build | 2 +- 5 files changed, 33 insertions(+), 41 deletions(-) diff --git a/authz/meson.build b/authz/meson.build index 88fa7769cb..42a1ec0ff6 100644 --- a/authz/meson.build +++ b/authz/meson.build @@ -6,4 +6,4 @@ authz_ss.add(files( 'simple.c', )) =20 -authz_ss.add(when: ['CONFIG_AUTH_PAM', pam], if_true: files('pamacct.c')) +authz_ss.add(when: pam, if_true: files('pamacct.c')) diff --git a/configure b/configure index 3d36eea55f..237e99c3d0 100755 --- a/configure +++ b/configure @@ -407,7 +407,7 @@ tls_priority=3D"NORMAL" gnutls=3D"auto" nettle=3D"auto" gcrypt=3D"auto" -auth_pam=3D"$default_feature" +auth_pam=3D"auto" vte=3D"$default_feature" virglrenderer=3D"$default_feature" tpm=3D"$default_feature" @@ -1383,9 +1383,9 @@ for opt do ;; --enable-gcrypt) gcrypt=3D"enabled" ;; - --disable-auth-pam) auth_pam=3D"no" + --disable-auth-pam) auth_pam=3D"disabled" ;; - --enable-auth-pam) auth_pam=3D"yes" + --enable-auth-pam) auth_pam=3D"enabled" ;; --enable-rdma) rdma=3D"yes" ;; @@ -2799,33 +2799,6 @@ EOF fi fi =20 -########################################## -# PAM probe - -if test "$auth_pam" !=3D "no"; then - cat > $TMPC < -#include -int main(void) { - const char *service_name =3D "qemu"; - const char *user =3D "frank"; - const struct pam_conv pam_conv =3D { 0 }; - pam_handle_t *pamh =3D NULL; - pam_start(service_name, user, &pam_conv, &pamh); - return 0; -} -EOF - if compile_prog "" "-lpam" ; then - auth_pam=3Dyes - else - if test "$auth_pam" =3D "yes"; then - feature_not_found "PAM" "Install PAM development package" - else - auth_pam=3Dno - fi - fi -fi - ########################################## # VTE probe =20 @@ -5540,9 +5513,6 @@ if test "$gdbus_codegen" !=3D "" ; then echo "GDBUS_CODEGEN=3D$gdbus_codegen" >> $config_host_mak fi echo "CONFIG_TLS_PRIORITY=3D\"$tls_priority\"" >> $config_host_mak -if test "$auth_pam" =3D "yes" ; then - echo "CONFIG_AUTH_PAM=3Dy" >> $config_host_mak -fi if test "$have_broken_size_max" =3D "yes" ; then echo "HAVE_BROKEN_SIZE_MAX=3Dy" >> $config_host_mak fi @@ -6251,7 +6221,7 @@ if test "$skip_meson" =3D no; then -Dcurl=3D$curl -Dglusterfs=3D$glusterfs -Dbzip2=3D$bzip2 -Dlibiscs= i=3D$libiscsi \ -Dlibnfs=3D$libnfs -Diconv=3D$iconv -Dcurses=3D$curses -Dlibudev= =3D$libudev\ -Drbd=3D$rbd -Dlzo=3D$lzo -Dsnappy=3D$snappy -Dlzfse=3D$lzfse \ - -Dgnutls=3D$gnutls -Dnettle=3D$nettle -Dgcrypt=3D$gcrypt \ + -Dgnutls=3D$gnutls -Dnettle=3D$nettle -Dgcrypt=3D$gcrypt -Dauth_pa= m=3D$auth_pam \ -Dzstd=3D$zstd -Dseccomp=3D$seccomp -Dvirtfs=3D$virtfs -Dcap_ng=3D= $cap_ng \ -Dattr=3D$attr -Ddefault_devices=3D$default_devices \ -Ddocs=3D$docs -Dsphinx_build=3D$sphinx_build -Dinstall_blobs=3D$b= lobs \ diff --git a/meson.build b/meson.build index d4ce2ca57b..c9266bd3cc 100644 --- a/meson.build +++ b/meson.build @@ -325,10 +325,6 @@ if have_system or have_tools pixman =3D dependency('pixman-1', required: have_system, version:'>=3D0.= 21.8', method: 'pkg-config', kwargs: static_kwargs) endif -pam =3D not_found -if 'CONFIG_AUTH_PAM' in config_host - pam =3D cc.find_library('pam') -endif libaio =3D cc.find_library('aio', required: false) zlib =3D dependency('zlib', required: true, kwargs: static_kwargs) linux_io_uring =3D not_found @@ -907,6 +903,30 @@ if get_option('vnc').enabled() endif endif =20 +pam =3D not_found +if not get_option('auth_pam').auto() or have_system + pam =3D cc.find_library('pam', has_headers: ['security/pam_appl.h'], + required: get_option('auth_pam'), + kwargs: static_kwargs) +endif +if pam.found() and not cc.links(''' + #include + int main(void) { + const char *service_name =3D "qemu"; + const char *user =3D "frank"; + const struct pam_conv pam_conv =3D { 0 }; + pam_handle_t *pamh =3D NULL; + pam_start(service_name, user, &pam_conv, &pamh); + return 0; + }''', dependencies: pam) + pam =3D not_found + if get_option('auth_pam').enabled() + error('could not link libpam') + else + warning('could not link libpam, disabling') + endif +endif + snappy =3D not_found if not get_option('snappy').auto() or have_system snappy =3D cc.find_library('snappy', has_headers: ['snappy-c.h'], @@ -2729,7 +2749,7 @@ summary_info +=3D {'VTE support': config_host.h= as_key('CONFIG_VTE')} # TODO: add back version summary_info +=3D {'slirp support': slirp_opt =3D=3D 'disabled' ? fals= e : slirp_opt} summary_info +=3D {'libtasn1': tasn1.found()} -summary_info +=3D {'PAM': config_host.has_key('CONFIG_AUTH_P= AM')} +summary_info +=3D {'PAM': pam.found()} summary_info +=3D {'iconv support': iconv.found()} summary_info +=3D {'curses support': curses.found()} # TODO: add back version diff --git a/meson_options.txt b/meson_options.txt index 343ffffb7c..ac6e90da07 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -52,6 +52,8 @@ option('multiprocess', type: 'feature', value: 'auto', =20 option('attr', type : 'feature', value : 'auto', description: 'attr/xattr support') +option('auth_pam', type : 'feature', value : 'auto', + description: 'PAM access control') option('brlapi', type : 'feature', value : 'auto', description: 'brlapi character device driver') option('bzip2', type : 'feature', value : 'auto', diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 4c1ebc06ac..3e0504dd21 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -94,7 +94,7 @@ if have_block 'test-io-channel-tls': ['io-channel-helpers.c', 'crypto-tls-x509-hel= pers.c', 'pkix_asn1_tab.c', tasn1, io, crypto, gnutls]} endif - if 'CONFIG_AUTH_PAM' in config_host + if pam.found() tests +=3D {'test-authz-pam': [authz]} endif if xts =3D=3D 'private' --=20 2.31.1