summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--monitor_wrap.h4
-rw-r--r--sshpty.h6
3 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index bd295630..e3be2709 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 310b4251..8ecfdc0e 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 */
diff --git a/sshpty.h b/sshpty.h
index a7de7370..9a39e4a1 100644
--- a/sshpty.h
+++ b/sshpty.h
@@ -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 */