Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve "chown of PID file failed" message for missing CAP_CHOWN

Browse Source 
Print a specific INFO message instead of a generic WARNING message,
so users aren't inconvenienced and maintainers know what to do.

Debian currently runs this service as part of NetworkManager,
in a systemd service without CAP_CHOWN.  Other distributions may
have the same problem, or might add the issue in future.
This fix should communicate the issue clearly to them.
This commit is contained in:
Andrew Sayers
2025-01-06 14:44:34 +00:00
committed by Simon Kelley
parent 7af26eed32
commit 12e4565fef
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/dnsmasq.c
View File

@@ -61,6 +61,7 @@ int main (int argc, char **argv)
int need_cap_net_admin = 0; int need_cap_net_admin = 0;
int need_cap_net_raw = 0; int need_cap_net_raw = 0;
int need_cap_net_bind_service = 0; int need_cap_net_bind_service = 0;
int have_cap_chown = 0;
char *bound_device = NULL; char *bound_device = NULL;
int did_bind = 0; int did_bind = 0;
struct server *serv; struct server *serv;
@@ -556,6 +557,8 @@ int main (int argc, char **argv)
data = safe_malloc(sizeof(*data) * capsize); data = safe_malloc(sizeof(*data) * capsize);
capget(hdr, data); /* Get current values, for verification */ capget(hdr, data); /* Get current values, for verification */
have_cap_chown = data->permitted & (1 << CAP_CHOWN);
if (need_cap_net_admin && !(data->permitted & (1 << CAP_NET_ADMIN))) if (need_cap_net_admin && !(data->permitted & (1 << CAP_NET_ADMIN)))
fail = "NET_ADMIN"; fail = "NET_ADMIN";
else if (need_cap_net_raw && !(data->permitted & (1 << CAP_NET_RAW))) else if (need_cap_net_raw && !(data->permitted & (1 << CAP_NET_RAW)))
@@ -869,7 +872,14 @@ int main (int argc, char **argv)
my_syslog(LOG_INFO, _("compile time options: %s"), compile_opts); my_syslog(LOG_INFO, _("compile time options: %s"), compile_opts);
if (chown_warn != 0) if (chown_warn != 0)
my_syslog(LOG_WARNING, "chown of PID file %s failed: %s", daemon->runfile, strerror(chown_warn)); {
#if defined(HAVE_LINUX_NETWORK)
if (chown_warn == EPERM && !have_cap_chown)
my_syslog(LOG_INFO, "chown of PID file %s failed: please add capability CAP_CHOWN", daemon->runfile);
else
#endif
my_syslog(LOG_WARNING, "chown of PID file %s failed: %s", daemon->runfile, strerror(chown_warn));
}
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
if (option_bool(OPT_DBUS)) if (option_bool(OPT_DBUS))