From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6C6DC432C0 for ; Fri, 29 Nov 2019 13:07:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A9329216F4 for ; Fri, 29 Nov 2019 13:07:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A9329216F4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iafzo-0006TJ-Q6 for qemu-devel@archiver.kernel.org; Fri, 29 Nov 2019 08:07:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49621) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iafAZ-0004cZ-9K for qemu-devel@nongnu.org; Fri, 29 Nov 2019 07:14:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iafAU-0004ql-GD for qemu-devel@nongnu.org; Fri, 29 Nov 2019 07:14:41 -0500 Received: from 7.mo5.mail-out.ovh.net ([178.32.124.100]:52925) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iafAU-0004D7-5O for qemu-devel@nongnu.org; Fri, 29 Nov 2019 07:14:38 -0500 Received: from player711.ha.ovh.net (unknown [10.109.143.145]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 46E4B25CDB1 for ; Fri, 29 Nov 2019 13:14:26 +0100 (CET) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player711.ha.ovh.net (Postfix) with ESMTPSA id 77978C9700C1; Fri, 29 Nov 2019 12:14:22 +0000 (UTC) Date: Fri, 29 Nov 2019 13:14:21 +0100 From: Greg Kurz To: Paolo Bonzini Subject: Re: [PATCH] build: rename CONFIG_LIBCAP to CONFIG_LIBCAP_NG Message-ID: <20191129131421.6a3f0db5@bahia.w3ibm.bluemix.net> In-Reply-To: <20191129111632.22840-1-pbonzini@redhat.com> References: <20191129111632.22840-1-pbonzini@redhat.com> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Ovh-Tracer-Id: 837951006930147790 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrudeiledgfeefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdqfffguegfifdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepfffhvffukfgjfhfogggtgfesthejredtredtvdenucfhrhhomhepifhrvghgucfmuhhriicuoehgrhhouhhgsehkrghougdrohhrgheqnecukfhppedtrddtrddtrddtpdekvddrvdehfedrvddtkedrvdegkeenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepphhlrgihvghrjeduuddrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehgrhhouhhgsehkrghougdrohhrghdprhgtphhtthhopehqvghmuhdquggvvhgvlhesnhhonhhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 178.32.124.100 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, qemu-devel@nongnu.org, dgilbert@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 29 Nov 2019 12:16:31 +0100 Paolo Bonzini wrote: > Since we are using the newer capng library, rename the symbol to match. > > Signed-off-by: Paolo Bonzini > --- 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" = "yes" ; then > echo "CONFIG_L2TPV3=y" >> $config_host_mak > fi > if test "$cap_ng" = "yes" ; then > - echo "CONFIG_LIBCAP=y" >> $config_host_mak > + echo "CONFIG_LIBCAP_NG=y" >> $config_host_mak > fi > echo "CONFIG_AUDIO_DRIVERS=$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 @@ > > #include "net/tap-linux.h" > > -#ifdef CONFIG_LIBCAP > +#ifdef CONFIG_LIBCAP_NG > #include > #endif > > @@ -207,7 +207,7 @@ static int send_fd(int c, int fd) > return sendmsg(c, &msg, 0); > } > > -#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 = EXIT_SUCCESS; > > -#ifdef CONFIG_LIBCAP > +#ifdef CONFIG_LIBCAP_NG > /* if we're run from an suid binary, immediately drop privileges preserving > * cap_net_admin */ > if (geteuid() == 0 && getuid() != 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 > > -#ifdef CONFIG_LIBCAP > +#ifdef CONFIG_LIBCAP_NG > #include > #endif > #include > @@ -70,7 +70,7 @@ static int num_active_sockets = 1; > static int noisy; > static int verbose; > > -#ifdef CONFIG_LIBCAP > +#ifdef CONFIG_LIBCAP_NG > static int uid = -1; > static int gid = -1; > #endif > @@ -97,7 +97,7 @@ static void usage(const char *name) > " (default '%s')\n" > " -T, --trace [[enable=]][,events=][,file=]\n" > " specify tracing options\n" > -#ifdef CONFIG_LIBCAP > +#ifdef CONFIG_LIBCAP_NG > " -u, --user=USER user to drop privileges to\n" > " -g, --group=GROUP group to drop privileges to\n" > #endif > @@ -827,7 +827,7 @@ static void close_server_socket(void) > num_active_sockets--; > } > > -#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 = g_strdup(optarg); > pidfile_specified = true; > break; > -#ifdef CONFIG_LIBCAP > +#ifdef CONFIG_LIBCAP_NG > case 'u': { > unsigned long res; > struct passwd *userinfo = getpwnam(optarg); > @@ -1056,7 +1056,7 @@ int main(int argc, char **argv) > exit(EXIT_FAILURE); > } > > -#ifdef CONFIG_LIBCAP > +#ifdef CONFIG_LIBCAP_NG > if (drop_privileges() < 0) { > error_report("Failed to drop privileges: %s", strerror(errno)); > exit(EXIT_FAILURE);