[src/trunk]: src/usr.sbin/pppd/pppd don't set flags in the wrong fields.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0ed73ee2c7b0
branches:  trunk
changeset: 767604:0ed73ee2c7b0
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jul 24 01:35:15 2011 +0000

description:
don't set flags in the wrong fields.

diffstat:

 usr.sbin/pppd/pppd/sys-bsd.c |  20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diffs (55 lines):

diff -r 8e2ed99dcf57 -r 0ed73ee2c7b0 usr.sbin/pppd/pppd/sys-bsd.c
--- a/usr.sbin/pppd/pppd/sys-bsd.c      Sun Jul 24 00:33:38 2011 +0000
+++ b/usr.sbin/pppd/pppd/sys-bsd.c      Sun Jul 24 01:35:15 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys-bsd.c,v 1.63 2011/04/02 10:19:27 mbalmer Exp $     */
+/*     $NetBSD: sys-bsd.c,v 1.64 2011/07/24 01:35:15 christos Exp $    */
 
 /*
  * sys-bsd.c - System-dependent procedures for setting up
@@ -79,7 +79,7 @@
 #if 0
 #define RCSID  "Id: sys-bsd.c,v 1.47 2000/04/13 12:04:23 paulus Exp "
 #else
-__RCSID("$NetBSD: sys-bsd.c,v 1.63 2011/04/02 10:19:27 mbalmer Exp $");
+__RCSID("$NetBSD: sys-bsd.c,v 1.64 2011/07/24 01:35:15 christos Exp $");
 #endif
 #endif
 
@@ -940,8 +940,8 @@
     fchmod(*slave_fdp, S_IRUSR | S_IWUSR);
     if (tcgetattr(*slave_fdp, &tios) == 0) {
        tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB);
-       tios.c_cflag |= CS8 | CREAD;
-       tios.c_iflag  = IGNPAR | CLOCAL;
+       tios.c_cflag |= CS8 | CREAD | CLOCAL;
+       tios.c_iflag  = IGNPAR;
        tios.c_oflag  = 0;
        tios.c_lflag  = 0;
        if (tcsetattr(*slave_fdp, TCSAFLUSH, &tios) < 0)
@@ -971,7 +971,7 @@
 
     if (tcgetattr(loop_slave, &tios) == 0) {
        tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB);
-       tios.c_cflag |= CS8 | CREAD;
+       tios.c_cflag |= CS8 | CREAD | CLOCAL;
        tios.c_iflag = IGNPAR;
        tios.c_oflag = 0;
        tios.c_lflag = 0;
@@ -979,9 +979,13 @@
            warn("%s: couldn't set attributes on loopback: %m", __func__);
     }
 
-    if ((flags = fcntl(loop_master, F_GETFL)) != -1) 
-       if (fcntl(loop_master, F_SETFL, flags | O_NONBLOCK) == -1)
-           warn("%s: couldn't set loopback to nonblock: %m", __func__);
+    flags = fcntl(loop_master, F_GETFL);
+    if (flags == -1 || fcntl(loop_master, F_SETFL, flags | O_NONBLOCK) == -1)
+           warn("%s: couldn't set master loopback to nonblock: %m", __func__);
+
+    flags = fcntl(loop_slave, F_GETFL);
+    if (flags == -1 || fcntl(loop_slave, F_SETFL, flags | O_NONBLOCK) == -1)
+           warn("%s: couldn't set slave loopback to nonblock: %m", __func__);
 
     ppp_fd = loop_slave;
     if (ioctl(ppp_fd, TIOCSETD, &pppdisc) < 0)