d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Two no-op fixes to improve corretness of syslogd code:

Browse Source 
1) Use [AP]F_LOCAL rather than [AP]F_UNIX.
2) When copying a pipe's name, use f->f_un.f_pipe.f_pname, not f->f_un.f_fname.

PR:		20889
Submitted by:	Damieon Stark
PR:		116642
Submitted by:	Jim Pirzyk
Reviewed by:	md5
This commit is contained in:
David Malone 2008-02-20 21:54:41 +00:00
parent c9f892eb86
commit 6f540420dd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/syslogd/syslogd.c
View File

@ -512,9 +512,9 @@ main(int argc, char *argv[])
STAILQ_FOREACH_SAFE(fx, &funixes, next, fx1) {
(void)unlink(fx->name);
memset(&sunx, 0, sizeof(sunx));
sunx.sun_family = AF_UNIX;
sunx.sun_family = AF_LOCAL;
(void)strlcpy(sunx.sun_path, fx->name, sizeof(sunx.sun_path));
fx->s = socket(AF_UNIX, SOCK_DGRAM, 0);
fx->s = socket(PF_LOCAL, SOCK_DGRAM, 0);
if (fx->s < 0 ||
bind(fx->s, (struct sockaddr *)&sunx, SUN_LEN(&sunx)) < 0 ||
chmod(fx->name, fx->mode) < 0) {
@ -1964,7 +1964,8 @@ cfline(const char *line, struct filed *f, const char *prog, const char *host)
case '|':
f->f_un.f_pipe.f_pid = 0;
(void)strlcpy(f->f_un.f_fname, p + 1, sizeof(f->f_un.f_fname));
(void)strlcpy(f->f_un.f_pipe.f_pname, p + 1,
sizeof(f->f_un.f_pipe.f_pname));
f->f_type = F_PIPE;
break;