=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshpty.c,v retrieving revision 1.3.2.2 retrieving revision 1.4 diff -u -r1.3.2.2 -r1.4 --- src/usr.bin/ssh/sshpty.c 2002/06/26 18:22:37 1.3.2.2 +++ src/usr.bin/ssh/sshpty.c 2001/12/19 07:18:56 1.4 @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshpty.c,v 1.3.2.2 2002/06/26 18:22:37 miod Exp $"); +RCSID("$OpenBSD: sshpty.c,v 1.4 2001/12/19 07:18:56 deraadt Exp $"); #include #include "sshpty.h" @@ -225,8 +225,9 @@ if (fd < 0) error("open /dev/tty failed - could not set controlling tty: %.100s", strerror(errno)); - else + else { close(fd); + } } /* Changes the window size associated with the pty. */ @@ -236,7 +237,6 @@ int xpixel, int ypixel) { struct winsize w; - w.ws_row = row; w.ws_col = col; w.ws_xpixel = xpixel; @@ -274,13 +274,13 @@ if (st.st_uid != pw->pw_uid || st.st_gid != gid) { if (chown(ttyname, pw->pw_uid, gid) < 0) { if (errno == EROFS && - (st.st_uid == pw->pw_uid || st.st_uid == 0)) - error("chown(%.100s, %u, %u) failed: %.100s", - ttyname, (u_int)pw->pw_uid, (u_int)gid, + (st.st_uid == pw->pw_uid || st.st_uid == 0)) + error("chown(%.100s, %d, %d) failed: %.100s", + ttyname, pw->pw_uid, gid, strerror(errno)); else - fatal("chown(%.100s, %u, %u) failed: %.100s", - ttyname, (u_int)pw->pw_uid, (u_int)gid, + fatal("chown(%.100s, %d, %d) failed: %.100s", + ttyname, pw->pw_uid, gid, strerror(errno)); } }