From fb39d8b8862a729a2fcb994d9aa2282f1ff8a89b Mon Sep 17 00:00:00 2001 From: hipp Date: Fri, 30 May 1997 14:05:54 +0000 Subject: [PATCH] Minor patches --- ipppd/main.c | 8 ++++---- ipppd/sys-linux.c | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ipppd/main.c b/ipppd/main.c index 8e257d1d..ce7a95c6 100644 --- a/ipppd/main.c +++ b/ipppd/main.c @@ -25,7 +25,7 @@ * PATCHLEVEL 9 */ -char main_rcsid[] = "$Id: main.c,v 1.6 1997/05/28 10:07:34 hipp Exp $"; +char main_rcsid[] = "$Id: main.c,v 1.7 1997/05/30 14:05:54 hipp Exp $"; #include #include @@ -246,8 +246,8 @@ void main(int argc,char **argv) if (!nodetach) { int a,f; - f = fork(); - if(f < 0) { + f = fork(); + if(f < 0) { perror("Couldn't detach from controlling terminal"); exit(1); } @@ -920,7 +920,7 @@ int device_script(char *program,int in,int out) setgid(getgid()); execl("/bin/sh", "sh", "-c", program, (char *)0); syslog(LOG_ERR, "could not exec /bin/sh: %m"); - _exit(99); + exit(99); /* NOTREACHED */ } diff --git a/ipppd/sys-linux.c b/ipppd/sys-linux.c index 0b1c1610..21f9b714 100644 --- a/ipppd/sys-linux.c +++ b/ipppd/sys-linux.c @@ -22,7 +22,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -char sys_rcsid[] = "$Id: sys-linux.c,v 1.4 1997/05/28 10:07:40 hipp Exp $"; +char sys_rcsid[] = "$Id: sys-linux.c,v 1.5 1997/05/30 14:05:57 hipp Exp $"; #define _LINUX_STRING_H_ @@ -273,7 +273,9 @@ void output (int linkunit, unsigned char *p, int len) if (write(lns[linkunit].fd, p, len) < 0) { syslog(LOG_ERR, "write, unit: %d fd: %d: %m",linkunit,lns[linkunit].fd); +#if 0 die(1); +#endif } } @@ -289,7 +291,9 @@ int read_packet (unsigned char *buf,int linkunit) if (errno == EWOULDBLOCK) return -1; syslog(LOG_ERR, "read(fd): %m"); +#if 0 die(1); +#endif } return len; }