From: djm <djm>
Date: Sat, 25 Mar 2006 13:06:14 +0000 (+0000)
Subject:    - deraadt@cvs.openbsd.org 2006/03/20 18:14:02
X-Git-Tag: V_4_4_P1~334
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/97f67e9ad5309e147d648c4c157b8ac508bfb20f

   - deraadt@cvs.openbsd.org 2006/03/20 18:14:02
     [monitor_wrap.h sshpty.h]
     sprinkle u_int throughout pty subsystem, ok markus
---

diff --git a/ChangeLog b/ChangeLog
index d9824f11..256c4fd4 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
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 */