emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted patch by Andreas Barth since it caused problems with opening the pipe

Browse Source
This commit is contained in:
Joey Schulze 2007-07-04 19:00:09 +00:00
parent e06d6174b5
commit c972380fef
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -64,8 +64,6 @@ Version 1.5
- use newer query_module function rather than stepping through /dev/kmem. - use newer query_module function rather than stepping through /dev/kmem.
. Matthew Fischer <futhark@vzavenue.net> . Matthew Fischer <futhark@vzavenue.net>
- Remove special treatment of the percent sign in klogd - Remove special treatment of the percent sign in klogd
. Andreas Barth <aba@not.so.argh.org>
- Prevent pipes from becoming the controlling tty
Version 1.4.1 Version 1.4.1

12
syslogd.c
View File

@ -487,9 +487,6 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88";
* Sat May 26 12:22:44 CEST 2007: Martin Schulze <joey@infodrom.org> * Sat May 26 12:22:44 CEST 2007: Martin Schulze <joey@infodrom.org>
* Properly accompany the MARK message with the facility. * Properly accompany the MARK message with the facility.
* *
* Mon May 28 19:00:37 CEST 2007: Andreas Barth <aba@not.so.argh.org>
* Prevent pipes from becoming the controlling tty.
*
* Mon May 28 19:44:39 CEST 2007: Martin Schulze <joey@infodrom.org> * Mon May 28 19:44:39 CEST 2007: Martin Schulze <joey@infodrom.org>
* Notify the waiting parent process if the client dies to it * Notify the waiting parent process if the client dies to it
* doesn't wait the entire five minutes. * doesn't wait the entire five minutes.
@ -2739,12 +2736,13 @@ void cfline(line, f)
if (syncfile) if (syncfile)
f->f_flags |= SYNC_FILE; f->f_flags |= SYNC_FILE;
if ( *p == '|' ) { if ( *p == '|' ) {
f->f_file = open(++p, O_RDWR|O_NONBLOCK);
f->f_type = F_PIPE; f->f_type = F_PIPE;
p++; } else {
} else f->f_file = open(p, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY,
0644);
f->f_type = F_FILE; f->f_type = F_FILE;
f->f_file = open(p, O_WRONLY|O_APPEND|O_CREAT|O_NONBLOCK|O_NOCTTY, }
0644);
if ( f->f_file < 0 ){ if ( f->f_file < 0 ){
f->f_file = -1; f->f_file = -1;