Fix name clash with libcap 2.29. Taken from upstream: https://github.com/iputils/iputils/commit/18f9a84e0e702841d6cc4d5f593de4fbd1348e83 diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c --- a/ninfod/ninfod.c +++ b/ninfod/ninfod.c @@ -455,7 +455,7 @@ static void do_daemonize(void) /* --------- */ #ifdef HAVE_LIBCAP static const cap_value_t cap_net_raw = CAP_NET_RAW; -static const cap_value_t cap_setuid = CAP_SETUID; +static const cap_value_t cap_setuserid = CAP_SETUID; static cap_flag_value_t cap_ok; #else static uid_t euid; @@ -487,7 +487,7 @@ static void limit_capabilities(void) cap_get_flag(cap_cur_p, CAP_SETUID, CAP_PERMITTED, &cap_ok); if (cap_ok != CAP_CLEAR) - cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); + cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); if (cap_set_proc(cap_p) < 0) { DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); @@ -520,8 +520,8 @@ static void drop_capabilities(void) /* setuid / setuid */ if (cap_ok != CAP_CLEAR) { - cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); - cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuid, CAP_SET); + cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); + cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuserid, CAP_SET); if (cap_set_proc(cap_p) < 0) { DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); ff/.gitignore?id=fd3d32886cde1564961b6d6606f47630bcb7b683'>diff
path: root/.gitignore
AgeCommit message (Expand)Author
2020-10-20gitignore: Ignore generated guile binary and intermediate products....Julien Lepiller
2020-09-17guix-install.sh: Support OpenRC....Morgan Smith
2020-07-17gitignore: Don't ignore daemon source code....Jakub Kądziołka
2020-06-28.gitignore: Ignore 'etc/committer.scm'....Brice Waegeneire
2020-05-16etc: Add a systemd unit to bind-mount @storedir@ read-only....Tobias Geerinckx-Rice
2020-05-14etc: indent-code.el: Use the --quick option....Maxim Cournoyer
2020-03-30.gitignore: Ignore test results in tests/services....Marius Bakke
2020-03-11Add system start-up files for guix-daemon....Danny Milosavljevic
2019-09-24Merge branch 'master' into core-updatesLudovic Courtès
2019-09-18doc: Add Guix Cookbook....Ricardo Wurmus
2019-06-14build: Remove 'gnu/packages/bootstrap' and its binaries....Ludovic Courtès
2019-04-26bootstrap: Break automake dependency on generated files....Miguel Ángel Arruga Vivas
2018-11-20.gitignore: Re-add 'authenticate' script....Marius Bakke
2018-06-14Remove 'guix-register' and its traces....Ludovic Courtès
2018-06-12.gitignore: Add doc/stamp-[0-9].Ludovic Courtès
2018-04-19gnu: doc: Allow documentation to be translated....Julien Lepiller