aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssh/monitor_wrap.h
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2006-09-30 13:29:51 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2006-09-30 13:29:51 +0000
commit761efaa70c2ed8d35722b7bc234a46bf2457f876 (patch)
treebba6f2fe7855d7b0095f9dc7720dc27bea4d1fdf /crypto/openssh/monitor_wrap.h
parent30c2033ae748d441213eed2e5c3fae760cc8ea61 (diff)
downloadsrc-761efaa70c2ed8d35722b7bc234a46bf2457f876.tar.gz
src-761efaa70c2ed8d35722b7bc234a46bf2457f876.zip
Notes
Diffstat (limited to 'crypto/openssh/monitor_wrap.h')
-rw-r--r--crypto/openssh/monitor_wrap.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/crypto/openssh/monitor_wrap.h b/crypto/openssh/monitor_wrap.h
index 310b425130c3..329189c2ada0 100644
--- a/crypto/openssh/monitor_wrap.h
+++ b/crypto/openssh/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.20 2006/08/03 03:34:42 deraadt Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -27,8 +27,6 @@
#ifndef _MM_WRAP_H_
#define _MM_WRAP_H_
-#include "key.h"
-#include "buffer.h"
extern int use_privsep;
#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}
struct monitor;
struct mm_master;
-struct passwd;
struct Authctxt;
int mm_is_monitor(void);
@@ -57,7 +54,6 @@ int mm_auth_rsa_verify_response(Key *, BIGNUM *, u_char *);
BIGNUM *mm_auth_rsa_generate_challenge(Key *);
#ifdef GSSAPI
-#include "ssh-gss.h"
OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *,
gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *);
@@ -82,7 +78,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 */
@@ -111,4 +107,4 @@ void *mm_zalloc(struct mm_master *, u_int, u_int);
void mm_zfree(struct mm_master *, void *);
void mm_init_compression(struct mm_master *);
-#endif /* _MM_H_ */
+#endif /* _MM_WRAP_H_ */