ericonr
/
sndio
mirror of https://github.com/ericonr/sndio.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

drop privs after daemonizing, reorder clean-up

This commit is contained in:
Alexandre Ratchov 2016-10-20 07:27:36 +02:00
parent 7061de0250
commit 33bbca5999
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sndiod/sndiod.c
View File

@ -374,9 +374,6 @@ main(int argc, char **argv)
mode = MODE_PLAY | MODE_REC; mode = MODE_PLAY | MODE_REC;
tcpaddr_list = NULL; tcpaddr_list = NULL;
setsig();
filelist_init();
while ((c = getopt(argc, argv, "a:b:c:C:de:f:j:L:m:q:r:s:t:U:v:w:x:z:")) != -1) { while ((c = getopt(argc, argv, "a:b:c:C:de:f:j:L:m:q:r:s:t:U:v:w:x:z:")) != -1) {
switch (c) { switch (c) {
case 'd': case 'd':
@ -474,6 +471,15 @@ main(int argc, char **argv)
mode, vol, mmc, dup) == NULL) mode, vol, mmc, dup) == NULL)
return 1; return 1;
} }
setsig();
filelist_init();
if (geteuid() == 0) {
if ((pw = getpwnam(SNDIO_USER)) == NULL)
errx(1, "unknown user %s", SNDIO_USER);
} else
pw = NULL;
getbasepath(base); getbasepath(base);
snprintf(path, SOCKPATH_MAX, "%s/" SOCKPATH_FILE "%u", base, unit); snprintf(path, SOCKPATH_MAX, "%s/" SOCKPATH_FILE "%u", base, unit);
if (!listen_new_un(path)) if (!listen_new_un(path))
@ -482,15 +488,9 @@ main(int argc, char **argv)
if (!listen_new_tcp(ta->host, AUCAT_PORT + unit)) if (!listen_new_tcp(ta->host, AUCAT_PORT + unit))
return 1; return 1;
} }
if (geteuid() == 0) { for (l = listen_list; l != NULL; l = l->next) {
if ((pw = getpwnam(SNDIO_USER)) == NULL) if (!listen_init(l))
errx(1, "unknown user %s", SNDIO_USER); return 1;
if (setpriority(PRIO_PROCESS, 0, SNDIO_PRIO) < 0)
err(1, "setpriority");
if (setgroups(1, &pw->pw_gid) ||
setgid(pw->pw_gid) ||
setuid(pw->pw_uid))
err(1, "cannot drop privileges");
} }
midi_init(); midi_init();
for (p = port_list; p != NULL; p = p->next) { for (p = port_list; p != NULL; p = p->next) {
@ -501,16 +501,20 @@ main(int argc, char **argv)
if (!dev_init(d)) if (!dev_init(d))
return 1; return 1;
} }
for (l = listen_list; l != NULL; l = l->next) {
if (!listen_init(l))
return 1;
}
if (background) { if (background) {
log_flush(); log_flush();
log_level = 0; log_level = 0;
if (daemon(0, 0) < 0) if (daemon(0, 0) < 0)
err(1, "daemon"); err(1, "daemon");
} }
if (pw != NULL) {
if (setpriority(PRIO_PROCESS, 0, SNDIO_PRIO) < 0)
err(1, "setpriority");
if (setgroups(1, &pw->pw_gid) ||
setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) ||
setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid))
err(1, "cannot drop privileges");
}
for (;;) { for (;;) {
if (quit_flag) if (quit_flag)
break; break;
@ -521,15 +525,16 @@ main(int argc, char **argv)
listen_close(listen_list); listen_close(listen_list);
while (sock_list != NULL) while (sock_list != NULL)
sock_close(sock_list); sock_close(sock_list);
while (opt_list != NULL)
opt_del(opt_list);
for (d = dev_list; d != NULL; d = d->next) for (d = dev_list; d != NULL; d = d->next)
dev_done(d); dev_done(d);
for (p = port_list; p != NULL; p = p->next) for (p = port_list; p != NULL; p = p->next)
port_done(p); port_done(p);
midi_done();
while (file_poll()) while (file_poll())
; /* nothing */ ; /* nothing */
midi_done();
while (opt_list != NULL)
opt_del(opt_list);
while (dev_list) while (dev_list)
dev_del(dev_list); dev_del(dev_list);
while (port_list) while (port_list)