mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: rename CONFIG_LIBCAP to CONFIG_LIBCAP_NG

Browse Source 
Since we are actually testing for the newer capng library, rename the
symbol to match.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-11-29 11:42:53 +01:00
parent 44901b5aff
commit a358bca240
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -6720,7 +6720,7 @@ if test "$l2tpv3" = "yes" ; then
echo "CONFIG_L2TPV3=y" >> $config_host_mak echo "CONFIG_L2TPV3=y" >> $config_host_mak
fi fi
if test "$cap_ng" = "yes" ; then if test "$cap_ng" = "yes" ; then
echo "CONFIG_LIBCAP=y" >> $config_host_mak echo "CONFIG_LIBCAP_NG=y" >> $config_host_mak
fi fi
echo "CONFIG_AUDIO_DRIVERS=$audio_drv_list" >> $config_host_mak echo "CONFIG_AUDIO_DRIVERS=$audio_drv_list" >> $config_host_mak
for drv in $audio_drv_list; do for drv in $audio_drv_list; do

6
qemu-bridge-helper.c
View File

@ -43,7 +43,7 @@
#include "net/tap-linux.h" #include "net/tap-linux.h"
#ifdef CONFIG_LIBCAP #ifdef CONFIG_LIBCAP_NG
#include <cap-ng.h> #include <cap-ng.h>
#endif #endif
@ -207,7 +207,7 @@ static int send_fd(int c, int fd)
return sendmsg(c, &msg, 0); return sendmsg(c, &msg, 0);
} }
#ifdef CONFIG_LIBCAP #ifdef CONFIG_LIBCAP_NG
static int drop_privileges(void) static int drop_privileges(void)
{ {
/* clear all capabilities */ /* clear all capabilities */
@ -246,7 +246,7 @@ int main(int argc, char **argv)
int access_allowed, access_denied; int access_allowed, access_denied;
int ret = EXIT_SUCCESS; int ret = EXIT_SUCCESS;
#ifdef CONFIG_LIBCAP #ifdef CONFIG_LIBCAP_NG
/* if we're run from an suid binary, immediately drop privileges preserving /* if we're run from an suid binary, immediately drop privileges preserving
* cap_net_admin */ * cap_net_admin */
if (geteuid() == 0 && getuid() != geteuid()) { if (geteuid() == 0 && getuid() != geteuid()) {

12
scsi/qemu-pr-helper.c
View File

@ -24,7 +24,7 @@
#include <linux/dm-ioctl.h> #include <linux/dm-ioctl.h>
#include <scsi/sg.h> #include <scsi/sg.h>
#ifdef CONFIG_LIBCAP #ifdef CONFIG_LIBCAP_NG
#include <cap-ng.h> #include <cap-ng.h>
#endif #endif
#include <pwd.h> #include <pwd.h>
@ -70,7 +70,7 @@ static int num_active_sockets = 1;
static int noisy; static int noisy;
static int verbose; static int verbose;
#ifdef CONFIG_LIBCAP #ifdef CONFIG_LIBCAP_NG
static int uid = -1; static int uid = -1;
static int gid = -1; static int gid = -1;
#endif #endif
@ -97,7 +97,7 @@ static void usage(const char *name)
" (default '%s')\n" " (default '%s')\n"
" -T, --trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n" " -T, --trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n"
" specify tracing options\n" " specify tracing options\n"
#ifdef CONFIG_LIBCAP #ifdef CONFIG_LIBCAP_NG
" -u, --user=USER user to drop privileges to\n" " -u, --user=USER user to drop privileges to\n"
" -g, --group=GROUP group to drop privileges to\n" " -g, --group=GROUP group to drop privileges to\n"
#endif #endif
@ -827,7 +827,7 @@ static void close_server_socket(void)
num_active_sockets--; num_active_sockets--;
} }
#ifdef CONFIG_LIBCAP #ifdef CONFIG_LIBCAP_NG
static int drop_privileges(void) static int drop_privileges(void)
{ {
/* clear all capabilities */ /* clear all capabilities */
@ -920,7 +920,7 @@ int main(int argc, char **argv)
pidfile = g_strdup(optarg); pidfile = g_strdup(optarg);
pidfile_specified = true; pidfile_specified = true;
break; break;
#ifdef CONFIG_LIBCAP #ifdef CONFIG_LIBCAP_NG
case 'u': { case 'u': {
unsigned long res; unsigned long res;
struct passwd *userinfo = getpwnam(optarg); struct passwd *userinfo = getpwnam(optarg);
@ -1056,7 +1056,7 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#ifdef CONFIG_LIBCAP #ifdef CONFIG_LIBCAP_NG
if (drop_privileges() < 0) { if (drop_privileges() < 0) {
error_report("Failed to drop privileges: %s", strerror(errno)); error_report("Failed to drop privileges: %s", strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);