tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2002/06/23 21:06:13 

[sshpty.c]
     KNF
This commit is contained in:
Ben Lindstrom 2002-06-23 21:42:50 +00:00
parent e23f4a3d28
commit 8ada5d0d0d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -26,6 +26,9 @@
- deraadt@cvs.openbsd.org 2002/06/23 20:39:45 - deraadt@cvs.openbsd.org 2002/06/23 20:39:45
[session.c] [session.c]
compression_level is u_int compression_level is u_int
- deraadt@cvs.openbsd.org 2002/06/23 21:06:13
[sshpty.c]
KNF
20020623 20020623
- (stevesk) [configure.ac] bug #255 LOGIN_NEEDS_UTMPX for AIX. - (stevesk) [configure.ac] bug #255 LOGIN_NEEDS_UTMPX for AIX.
@ -1070,4 +1073,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2261 2002/06/23 21:40:16 mouring Exp $ $Id: ChangeLog,v 1.2262 2002/06/23 21:42:50 mouring Exp $

8
sshpty.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshpty.c,v 1.5 2002/06/23 03:30:58 deraadt Exp $"); RCSID("$OpenBSD: sshpty.c,v 1.6 2002/06/23 21:06:13 deraadt Exp $");
#ifdef HAVE_UTIL_H #ifdef HAVE_UTIL_H
# include <util.h> # include <util.h>
@ -343,9 +343,8 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
if (fd < 0) if (fd < 0)
error("open /dev/tty failed - could not set controlling tty: %.100s", error("open /dev/tty failed - could not set controlling tty: %.100s",
strerror(errno)); strerror(errno));
else { else
close(fd); close(fd);
}
#endif /* _CRAY */ #endif /* _CRAY */
} }
@ -356,6 +355,7 @@ pty_change_window_size(int ptyfd, int row, int col,
int xpixel, int ypixel) int xpixel, int ypixel)
{ {
struct winsize w; struct winsize w;
w.ws_row = row; w.ws_row = row;
w.ws_col = col; w.ws_col = col;
w.ws_xpixel = xpixel; w.ws_xpixel = xpixel;
@ -393,7 +393,7 @@ pty_setowner(struct passwd *pw, const char *ttyname)
if (st.st_uid != pw->pw_uid || st.st_gid != gid) { if (st.st_uid != pw->pw_uid || st.st_gid != gid) {
if (chown(ttyname, pw->pw_uid, gid) < 0) { if (chown(ttyname, pw->pw_uid, gid) < 0) {
if (errno == EROFS && if (errno == EROFS &&
(st.st_uid == pw->pw_uid || st.st_uid == 0)) (st.st_uid == pw->pw_uid || st.st_uid == 0))
error("chown(%.100s, %u, %u) failed: %.100s", error("chown(%.100s, %u, %u) failed: %.100s",
ttyname, pw->pw_uid, gid, ttyname, pw->pw_uid, gid,
strerror(errno)); strerror(errno));