diff options
| -rw-r--r-- | sys/kern/exec_conf.c | 6 | ||||
| -rw-r--r-- | sys/kern/kern_sysctl.c | 6 | ||||
| -rw-r--r-- | sys/kern/tty.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/kern/exec_conf.c b/sys/kern/exec_conf.c index 60d92b590d4..6a2a5fc850e 100644 --- a/sys/kern/exec_conf.c +++ b/sys/kern/exec_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_conf.c,v 1.13 2003/08/21 18:56:07 tedu Exp $ */ +/* $OpenBSD: exec_conf.c,v 1.14 2003/08/23 19:21:15 deraadt Exp $ */ /* $NetBSD: exec_conf.c,v 1.16 1995/12/09 05:34:47 cgd Exp $ */ /* @@ -186,8 +186,8 @@ init_exec(void) */ if (exec_maxhdrsz == 0) { for (i = 0; i < nexecs; i++) - if (execsw[i].es_check != NULL - && execsw[i].es_hdrsz > exec_maxhdrsz) + if (execsw[i].es_check != NULL && + execsw[i].es_hdrsz > exec_maxhdrsz) exec_maxhdrsz = execsw[i].es_hdrsz; } } diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index beeffd00d94..d7fe3cfec4e 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.87 2003/08/23 18:12:20 fgsch Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.88 2003/08/23 19:21:15 deraadt Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -308,8 +308,8 @@ kern_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) if ((error = sysctl_int(oldp, oldlenp, newp, newlen, &level)) || newp == NULL) return (error); - if ((securelevel > 0 || level < -1) - && level < securelevel && p->p_pid != 1) + if ((securelevel > 0 || level < -1) && + level < securelevel && p->p_pid != 1) return (EPERM); securelevel = level; return (0); diff --git a/sys/kern/tty.c b/sys/kern/tty.c index bc808a570e5..924b686d74a 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.59 2003/08/15 20:32:18 tedu Exp $ */ +/* $OpenBSD: tty.c,v 1.60 2003/08/23 19:21:15 deraadt Exp $ */ /* $NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $ */ /*- @@ -1175,8 +1175,8 @@ ttywait(tp) error = 0; s = spltty(); while ((tp->t_outq.c_cc || ISSET(tp->t_state, TS_BUSY)) && - (ISSET(tp->t_state, TS_CARR_ON) || ISSET(tp->t_cflag, CLOCAL)) - && tp->t_oproc) { + (ISSET(tp->t_state, TS_CARR_ON) || ISSET(tp->t_cflag, CLOCAL)) && + tp->t_oproc) { (*tp->t_oproc)(tp); if ((tp->t_outq.c_cc || ISSET(tp->t_state, TS_BUSY)) && (ISSET(tp->t_state, TS_CARR_ON) || ISSET(tp->t_cflag, CLOCAL)) |