From nobody Wed Nov 12 23:16:01 2025 Delivered-To: importer@patchew.org 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; 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=1575028363; cv=none; d=zohomail.com; s=zohoarc; b=IPIhtHNJnMZU5r6CMU5uUzH7k4cp6RDdH0uWY7hmFbnuAS9N7FoqFr9ErDsngD4oru7luxuKeNRD9WD2h+6zTVSgjGpaGltz5XHUhskF8Qavs4mywRS9WAFokBFUtjAXbpEiSSZ2ocfRrRFkFw34RcSfWw2e8QRJPFc3SebB3XE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575028363; h=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=Zc/Us2UPy+ZYepKw32wsK73pj3ubDAEJqzqFzz2dr38=; b=bz48hs287SWfix5qafZUDU7HdtK8qG1wcR6cSufSGCnuZP0MeptYpLwSNFBiFHnx5Umr2WPTP+mt2UIRYuNgq/yOSNETiGbgpE6UZOZD3MO15fI6QO0relQiBx/MrysPUBiSHS4cWgkgRbTiM4FljUL64x3vsCe3o5mOId9qeeI= 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 1575028363867239.30932545619999; Fri, 29 Nov 2019 03:52:43 -0800 (PST) Received: from localhost ([::1]:57760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaepF-0003Rj-Qe for importer@patchew.org; Fri, 29 Nov 2019 06:52:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57108) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaeGM-00055D-Fn for qemu-devel@nongnu.org; Fri, 29 Nov 2019 06:16:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iaeGL-0001qJ-B9 for qemu-devel@nongnu.org; Fri, 29 Nov 2019 06:16:38 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:38019) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iaeGL-0001fI-4A for qemu-devel@nongnu.org; Fri, 29 Nov 2019 06:16:37 -0500 Received: by mail-wr1-x442.google.com with SMTP id i12so34774963wro.5 for ; Fri, 29 Nov 2019 03:16:36 -0800 (PST) Received: from donizetti.redhat.com ([2001:b07:6468:f312:459f:99a9:39f1:65ba]) by smtp.gmail.com with ESMTPSA id i71sm29752969wri.68.2019.11.29.03.16.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Nov 2019 03:16:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Zc/Us2UPy+ZYepKw32wsK73pj3ubDAEJqzqFzz2dr38=; b=bNk13opXUy/BBcjT/3kW4/c2uSMyMpYNYQ9CmTIq/26Tdq/KbL2paSYFMeNgM7z18J bcf2HH9ZLrogKmCnjAgbDoLLKl8rhovJBAJfz3HUwyhnOHaH+hlVLKwQKf5iIZ1aNkMw N9uYAuqICBy2sQ7YHtfE8NNmrOpWMzr+EqfRUwGCHOQPKTSTM432V9rx3bBhYrZa3LJQ ongkRec8xhn9CwM5osdpdpQHTLyJ8McQEedNK23l77TBRZcagK0Rmou5lm4jemHnBEVB lzMWGlAwcihDvO4V1WSKoUFMhbTzhPsIrZ1zla6VvNEpcifzh154GM7zJUftfMICYNSW GHOQ== 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 :mime-version:content-transfer-encoding; bh=Zc/Us2UPy+ZYepKw32wsK73pj3ubDAEJqzqFzz2dr38=; b=JTSTcvrNuhWfzNCxrzBdjYHJdhUqEwjn47rcnd5qI/8tXdQL7p3n1tiA/lUtF5nrX4 xq20HVEuT38ShUP+y4mpsuYb/fePxtTG7C5o5VeXNGiwJO8b9GoWfWNlzqvi5VIbOHDx L42LSb5Qk2G7vi6yYLz3YSlYO3AKWuQdlq8HCS4jxNlLRMceGNqyOpjzHIoqa0g/jg1n ZLr/xS6B7K4mUYGmSofRInLnjYdhbgI1SU82fMbhJFPZmObbZzW5s+zunQXaB/qY8PiR sFDcR6f56Thm9LdDa1o232er6uNmJvouzEi4uBzQzsJHdxGfHljGWZafNH5X6H7Wflg8 mssA== X-Gm-Message-State: APjAAAVsUDJ5VIJ4I82a+O0NRLTogCG9YYdAQmfP5jHi955HOzUz7jp/ GNF2bbOURxdUcl7O57pXXEZbBXOh X-Google-Smtp-Source: APXvYqx9gmdh1GNHB3k9w0WuklPJFdW6PcCxvmNll2WPR8GqHA85ZTMxyrp7swB9gsQ5YFOisTb0RA== X-Received: by 2002:adf:fe8c:: with SMTP id l12mr6004424wrr.215.1575026193667; Fri, 29 Nov 2019 03:16:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] build: rename CONFIG_LIBCAP to CONFIG_LIBCAP_NG Date: Fri, 29 Nov 2019 12:16:31 +0100 Message-Id: <20191129111632.22840-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 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: berrange@redhat.com, dgilbert@redhat.com, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Since we are using the newer capng library, rename the symbol to match. Signed-off-by: Paolo Bonzini Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Greg Kurz --- configure | 2 +- qemu-bridge-helper.c | 6 +++--- scsi/qemu-pr-helper.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 6099be1d84..afe9393f04 100755 --- a/configure +++ b/configure @@ -6759,7 +6759,7 @@ if test "$l2tpv3" =3D "yes" ; then echo "CONFIG_L2TPV3=3Dy" >> $config_host_mak fi if test "$cap_ng" =3D "yes" ; then - echo "CONFIG_LIBCAP=3Dy" >> $config_host_mak + echo "CONFIG_LIBCAP_NG=3Dy" >> $config_host_mak fi echo "CONFIG_AUDIO_DRIVERS=3D$audio_drv_list" >> $config_host_mak for drv in $audio_drv_list; do diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c index 3d50ec094c..88b26747fc 100644 --- a/qemu-bridge-helper.c +++ b/qemu-bridge-helper.c @@ -43,7 +43,7 @@ =20 #include "net/tap-linux.h" =20 -#ifdef CONFIG_LIBCAP +#ifdef CONFIG_LIBCAP_NG #include #endif =20 @@ -207,7 +207,7 @@ static int send_fd(int c, int fd) return sendmsg(c, &msg, 0); } =20 -#ifdef CONFIG_LIBCAP +#ifdef CONFIG_LIBCAP_NG static int drop_privileges(void) { /* clear all capabilities */ @@ -246,7 +246,7 @@ int main(int argc, char **argv) int access_allowed, access_denied; int ret =3D EXIT_SUCCESS; =20 -#ifdef CONFIG_LIBCAP +#ifdef CONFIG_LIBCAP_NG /* if we're run from an suid binary, immediately drop privileges prese= rving * cap_net_admin */ if (geteuid() =3D=3D 0 && getuid() !=3D geteuid()) { diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c index debb18f4aa..0659ceef09 100644 --- a/scsi/qemu-pr-helper.c +++ b/scsi/qemu-pr-helper.c @@ -24,7 +24,7 @@ #include #include =20 -#ifdef CONFIG_LIBCAP +#ifdef CONFIG_LIBCAP_NG #include #endif #include @@ -70,7 +70,7 @@ static int num_active_sockets =3D 1; static int noisy; static int verbose; =20 -#ifdef CONFIG_LIBCAP +#ifdef CONFIG_LIBCAP_NG static int uid =3D -1; static int gid =3D -1; #endif @@ -97,7 +97,7 @@ static void usage(const char *name) " (default '%s')\n" " -T, --trace [[enable=3D]][,events=3D][,file=3D]\n" " specify tracing options\n" -#ifdef CONFIG_LIBCAP +#ifdef CONFIG_LIBCAP_NG " -u, --user=3DUSER user to drop privileges to\n" " -g, --group=3DGROUP group to drop privileges to\n" #endif @@ -827,7 +827,7 @@ static void close_server_socket(void) num_active_sockets--; } =20 -#ifdef CONFIG_LIBCAP +#ifdef CONFIG_LIBCAP_NG static int drop_privileges(void) { /* clear all capabilities */ @@ -920,7 +920,7 @@ int main(int argc, char **argv) pidfile =3D g_strdup(optarg); pidfile_specified =3D true; break; -#ifdef CONFIG_LIBCAP +#ifdef CONFIG_LIBCAP_NG case 'u': { unsigned long res; struct passwd *userinfo =3D getpwnam(optarg); @@ -1056,7 +1056,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } =20 -#ifdef CONFIG_LIBCAP +#ifdef CONFIG_LIBCAP_NG if (drop_privileges() < 0) { error_report("Failed to drop privileges: %s", strerror(errno)); exit(EXIT_FAILURE); --=20 2.21.0