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)); 630446aedab1d62a81667cb657'>commitdiff
path: root/gnu/services/herd.scm
u/packages/xml.scm, gnu/packages/xorg.scm, gnu/packages/yasm.scm, gnu/packages/zip.scm, guix/build/cmake-build-system.scm, guix/build/perl-build-system.scm, guix/build/python-build-system.scm, guix/download.scm: Replaces uses of #:renamer and 'symbol-prefix-proc' with #:prefix.
AgeCommit message (Expand)Author
2023-07-21services: herd: Add a new 'current-service' procedure....* gnu/services/herd.scm (current-service): New procedure, mostly reusing the existing current-services. (current-services): Implement in terms of the above procedure. Maxim Cournoyer
2023-05-30services: herd: "Resolve" transient services only when needed....This allows us to get rid of the "eval root" actions, which in turn would lead to confusing "Evaluating user expression" messages. Fixes <https://issues.guix.gnu.org/55857>. * gnu/services/herd.scm (resolve-transients): In 'values', avoid 'eval-there' call when UNRESOLVED is empty. Ludovic Courtès
2023-04-21services: herd: 'load-services/safe' is synonymous with 'load-services'....This is a followup to 547965aa27b6a09cadf42130b7ec7db3f1aee61f. * gnu/services/herd.scm (load-services/safe): Make an alias for 'load-services'. Ludovic Courtès
2023-03-26services: herd: Remove workaround for Shepherd < 0.5.0....* gnu/services/herd.scm (load-services/safe): Remove workaround for Shepherd < 0.5.0, released in 2018. Ludovic Courtès
Mark H Weaver