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

Remove confusion between --user and --script-user.

Browse Source
This commit is contained in:
Simon Kelley
2018-02-06 16:57:15 +00:00
parent 6340ca734f
commit 83e4b73596
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dnsmasq.c
View File

@@ -388,10 +388,12 @@ int main (int argc, char **argv)
daemon->scriptuser && daemon->scriptuser &&
(daemon->lease_change_command || daemon->luascript)) (daemon->lease_change_command || daemon->luascript))
{ {
if ((ent_pw = getpwnam(daemon->scriptuser))) struct passwd *scr_pw;
if ((scr_pw = getpwnam(daemon->scriptuser)))
{ {
script_uid = ent_pw->pw_uid; script_uid = scr_pw->pw_uid;
script_gid = ent_pw->pw_gid; script_gid = scr_pw->pw_gid;
} }
else else
baduser = daemon->scriptuser; baduser = daemon->scriptuser;
@@ -541,7 +543,7 @@ int main (int argc, char **argv)
{ {
if (!read_write(fd, (unsigned char *)daemon->namebuff, strlen(daemon->namebuff), 0)) if (!read_write(fd, (unsigned char *)daemon->namebuff, strlen(daemon->namebuff), 0))
err = 1; err = 1;
else else
{ {
while (retry_send(close(fd))); while (retry_send(close(fd)));
if (errno != 0) if (errno != 0)