Place TIOCSTI reminder block better

diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c
index 511378a..ee0c65c 100644 (file)
--- a/sys/kern/kern_pledge.c
+++ b/sys/kern/kern_pledge.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: kern_pledge.c,v 1.34 2015/10/16 13:59:58 deraadt Exp $        */
+/*     $OpenBSD: kern_pledge.c,v 1.35 2015/10/16 14:00:37 deraadt Exp $        */
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -1075,6 +1075,12 @@ pledge_ioctl_check(struct proc *p, long com, void *v)
 
        if ((p->p_p->ps_pledge & PLEDGE_TTY)) {
                switch (com) {
+#if notyet
+               case TIOCSTI:           /* ksh? csh? */
+                       if (fp->f_type == DTYPE_VNODE && (vp->v_flag & VISTTY))
+                               return (0);
+                       break;
+#endif
                case TIOCSPGRP:
                        if ((p->p_p->ps_pledge & PLEDGE_PROC) == 0)
                                break;
@@ -1085,12 +1091,6 @@ pledge_ioctl_check(struct proc *p, long com, void *v)
                        if (fp->f_type == DTYPE_VNODE && (vp->v_flag & VISTTY))
                                return (0);
                        return (ENOTTY);
-#if notyet
-               case TIOCSTI:           /* ksh? csh? */
-                       if (fp->f_type == DTYPE_VNODE && (vp->v_flag & VISTTY))
-                               return (0);
-                       break;
-#endif
                case TIOCSWINSZ:
                case TIOCCBRK:          /* cu */
                case TIOCSBRK:          /* cu */