diff options
| author | Damien Miller <djm@mindrot.org> | 2006-03-26 00:06:14 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2006-03-26 00:06:14 +1100 |
| commit | ed3986a00492c5a7f1f284f724dc4dd4063ea785 (patch) | |
| tree | 564695a7a2c2a852ff7f5f31d8d1096f484a46d5 | |
| parent | 91a2d9746a0934777e9a43f3671db1daa309c1ab (diff) | |
- deraadt@cvs.openbsd.org 2006/03/20 18:14:02
[monitor_wrap.h sshpty.h]
sprinkle u_int throughout pty subsystem, ok markus
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | monitor_wrap.h | 4 | ||||
| -rw-r--r-- | sshpty.h | 6 |
3 files changed, 9 insertions, 6 deletions
@@ -44,6 +44,9 @@ [gss-serv.c] last lot of GSSAPI related leaks detected by Coverity via elad AT netbsd.org; reviewed by simon AT sxw.org.uk; deraadt@ ok + - deraadt@cvs.openbsd.org 2006/03/20 18:14:02 + [monitor_wrap.h sshpty.h] + sprinkle u_int throughout pty subsystem, ok markus 20060318 - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via @@ -4236,4 +4239,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4236 2006/03/25 13:05:44 djm Exp $ +$Id: ChangeLog,v 1.4237 2006/03/25 13:06:14 djm Exp $ diff --git a/monitor_wrap.h b/monitor_wrap.h index 310b42513..8ecfdc0e3 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.h,v 1.14 2004/06/21 17:36:31 avsm Exp $ */ +/* $OpenBSD: monitor_wrap.h,v 1.15 2006/03/20 18:14:02 deraadt Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> @@ -82,7 +82,7 @@ void mm_audit_run_command(const char *); struct Session; void mm_terminate(void); -int mm_pty_allocate(int *, int *, char *, int); +int mm_pty_allocate(int *, int *, char *, size_t); void mm_session_pty_cleanup2(struct Session *); /* SSHv1 interfaces */ @@ -1,4 +1,4 @@ -/* $OpenBSD: sshpty.h,v 1.6 2006/02/07 01:42:00 stevesk Exp $ */ +/* $OpenBSD: sshpty.h,v 1.7 2006/03/20 18:14:02 deraadt Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -23,10 +23,10 @@ struct termios get_saved_tio(void); void leave_raw_mode(void); void enter_raw_mode(void); -int pty_allocate(int *, int *, char *, int); +int pty_allocate(int *, int *, char *, size_t); void pty_release(const char *); void pty_make_controlling_tty(int *, const char *); -void pty_change_window_size(int, int, int, int, int); +void pty_change_window_size(int, u_int, u_int, u_int, u_int); void pty_setowner(struct passwd *, const char *); #endif /* SSHPTY_H */ |