diff options
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index 8417b61f8..5920a90b2 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.20 2006/08/03 03:34:42 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -27,8 +27,6 @@ | |||
27 | 27 | ||
28 | #ifndef _MM_WRAP_H_ | 28 | #ifndef _MM_WRAP_H_ |
29 | #define _MM_WRAP_H_ | 29 | #define _MM_WRAP_H_ |
30 | #include "key.h" | ||
31 | #include "buffer.h" | ||
32 | 30 | ||
33 | extern int use_privsep; | 31 | extern int use_privsep; |
34 | #define PRIVSEP(x) (use_privsep ? mm_##x : x) | 32 | #define PRIVSEP(x) (use_privsep ? mm_##x : x) |
@@ -37,7 +35,6 @@ enum mm_keytype {MM_NOKEY, MM_HOSTKEY, MM_USERKEY, MM_RSAHOSTKEY, MM_RSAUSERKEY} | |||
37 | 35 | ||
38 | struct monitor; | 36 | struct monitor; |
39 | struct mm_master; | 37 | struct mm_master; |
40 | struct passwd; | ||
41 | struct Authctxt; | 38 | struct Authctxt; |
42 | 39 | ||
43 | int mm_is_monitor(void); | 40 | int mm_is_monitor(void); |
@@ -58,7 +55,6 @@ int mm_auth_rsa_verify_response(Key *, BIGNUM *, u_char *); | |||
58 | BIGNUM *mm_auth_rsa_generate_challenge(Key *); | 55 | BIGNUM *mm_auth_rsa_generate_challenge(Key *); |
59 | 56 | ||
60 | #ifdef GSSAPI | 57 | #ifdef GSSAPI |
61 | #include "ssh-gss.h" | ||
62 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); | 58 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); |
63 | OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, | 59 | OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, |
64 | gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); | 60 | gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); |
@@ -84,7 +80,7 @@ void mm_audit_run_command(const char *); | |||
84 | 80 | ||
85 | struct Session; | 81 | struct Session; |
86 | void mm_terminate(void); | 82 | void mm_terminate(void); |
87 | int mm_pty_allocate(int *, int *, char *, int); | 83 | int mm_pty_allocate(int *, int *, char *, size_t); |
88 | void mm_session_pty_cleanup2(struct Session *); | 84 | void mm_session_pty_cleanup2(struct Session *); |
89 | 85 | ||
90 | /* SSHv1 interfaces */ | 86 | /* SSHv1 interfaces */ |
@@ -113,4 +109,4 @@ void *mm_zalloc(struct mm_master *, u_int, u_int); | |||
113 | void mm_zfree(struct mm_master *, void *); | 109 | void mm_zfree(struct mm_master *, void *); |
114 | void mm_init_compression(struct mm_master *); | 110 | void mm_init_compression(struct mm_master *); |
115 | 111 | ||
116 | #endif /* _MM_H_ */ | 112 | #endif /* _MM_WRAP_H_ */ |