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 bd2956304..e3be2709c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,9 @@
44 [gss-serv.c] 44 [gss-serv.c]
45 last lot of GSSAPI related leaks detected by Coverity via 45 last lot of GSSAPI related leaks detected by Coverity via
46 elad AT netbsd.org; reviewed by simon AT sxw.org.uk; deraadt@ ok 46 elad AT netbsd.org; reviewed by simon AT sxw.org.uk; deraadt@ ok
47 - deraadt@cvs.openbsd.org 2006/03/20 18:14:02
48 [monitor_wrap.h sshpty.h]
49 sprinkle u_int throughout pty subsystem, ok markus
47 50
4820060318 5120060318
49 - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via 52 - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via
@@ -4236,4 +4239,4 @@
4236 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4239 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4237 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4240 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4238 4241
4239$Id: ChangeLog,v 1.4236 2006/03/25 13:05:44 djm Exp $ 4242$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 @@
1/* $OpenBSD: monitor_wrap.h,v 1.14 2004/06/21 17:36:31 avsm Exp $ */ 1/* $OpenBSD: monitor_wrap.h,v 1.15 2006/03/20 18:14:02 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 4 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -82,7 +82,7 @@ void mm_audit_run_command(const char *);
82 82
83struct Session; 83struct Session;
84void mm_terminate(void); 84void mm_terminate(void);
85int mm_pty_allocate(int *, int *, char *, int); 85int mm_pty_allocate(int *, int *, char *, size_t);
86void mm_session_pty_cleanup2(struct Session *); 86void mm_session_pty_cleanup2(struct Session *);
87 87
88/* SSHv1 interfaces */ 88/* SSHv1 interfaces */
diff --git a/sshpty.h b/sshpty.h
index a7de73700..9a39e4a13 100644
--- a/sshpty.h
+++ b/sshpty.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshpty.h,v 1.6 2006/02/07 01:42:00 stevesk Exp $ */ 1/* $OpenBSD: sshpty.h,v 1.7 2006/03/20 18:14:02 deraadt Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -23,10 +23,10 @@ struct termios get_saved_tio(void);
23void leave_raw_mode(void); 23void leave_raw_mode(void);
24void enter_raw_mode(void); 24void enter_raw_mode(void);
25 25
26int pty_allocate(int *, int *, char *, int); 26int pty_allocate(int *, int *, char *, size_t);
27void pty_release(const char *); 27void pty_release(const char *);
28void pty_make_controlling_tty(int *, const char *); 28void pty_make_controlling_tty(int *, const char *);
29void pty_change_window_size(int, int, int, int, int); 29void pty_change_window_size(int, u_int, u_int, u_int, u_int);
30void pty_setowner(struct passwd *, const char *); 30void pty_setowner(struct passwd *, const char *);
31 31
32#endif /* SSHPTY_H */ 32#endif /* SSHPTY_H */