HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| 065cb27a MB |
1 | Fix name clash with libcap 2.29. |
| 2 | ||
| 3 | Taken from upstream: | |
| 4 | https://github.com/iputils/iputils/commit/18f9a84e0e702841d6cc4d5f593de4fbd1348e83 | |
| 5 | ||
| 6 | diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c | |
| 7 | --- a/ninfod/ninfod.c | |
| 8 | +++ b/ninfod/ninfod.c | |
| 9 | @@ -455,7 +455,7 @@ static void do_daemonize(void) | |
| 10 | /* --------- */ | |
| 11 | #ifdef HAVE_LIBCAP | |
| 12 | static const cap_value_t cap_net_raw = CAP_NET_RAW; | |
| 13 | -static const cap_value_t cap_setuid = CAP_SETUID; | |
| 14 | +static const cap_value_t cap_setuserid = CAP_SETUID; | |
| 15 | static cap_flag_value_t cap_ok; | |
| 16 | #else | |
| 17 | static uid_t euid; | |
| 18 | @@ -487,7 +487,7 @@ static void limit_capabilities(void) | |
| 19 | ||
| 20 | cap_get_flag(cap_cur_p, CAP_SETUID, CAP_PERMITTED, &cap_ok); | |
| 21 | if (cap_ok != CAP_CLEAR) | |
| 22 | - cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); | |
| 23 | + cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); | |
| 24 | ||
| 25 | if (cap_set_proc(cap_p) < 0) { | |
| 26 | DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); | |
| 27 | @@ -520,8 +520,8 @@ static void drop_capabilities(void) | |
| 28 | ||
| 29 | /* setuid / setuid */ | |
| 30 | if (cap_ok != CAP_CLEAR) { | |
| 31 | - cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); | |
| 32 | - cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuid, CAP_SET); | |
| 33 | + cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); | |
| 34 | + cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuserid, CAP_SET); | |
| 35 | ||
| 36 | if (cap_set_proc(cap_p) < 0) { | |
| 37 | DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); |