summaryrefslogtreecommitdiff
path: root/monitor.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2016-12-20 00:22:52 +0000
committerColin Watson <cjwatson@debian.org>2016-12-20 00:22:52 +0000
commit971a7653746a6972b907dfe0ce139c06e4a6f482 (patch)
tree70fb964265d57ae4967be55b75dbb2a122e9b969 /monitor.h
parenta8ed8d256b2e2c05b0c15565a7938028c5192277 (diff)
parent4a354fc231174901f2629437c2a6e924a2dd6772 (diff)
Import openssh_7.4p1.orig.tar.gz
Diffstat (limited to 'monitor.h')
-rw-r--r--monitor.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/monitor.h b/monitor.h
index 93b8b66dd..d68f67458 100644
--- a/monitor.h
+++ b/monitor.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.h,v 1.19 2015/01/19 19:52:16 markus Exp $ */ 1/* $OpenBSD: monitor.h,v 1.20 2016/09/28 16:33:07 djm Exp $ */
2 2
3/* 3/*
4 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 4 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -67,21 +67,17 @@ enum monitor_reqtype {
67 67
68}; 68};
69 69
70struct mm_master;
71struct monitor { 70struct monitor {
72 int m_recvfd; 71 int m_recvfd;
73 int m_sendfd; 72 int m_sendfd;
74 int m_log_recvfd; 73 int m_log_recvfd;
75 int m_log_sendfd; 74 int m_log_sendfd;
76 struct mm_master *m_zback;
77 struct mm_master *m_zlib;
78 struct kex **m_pkex; 75 struct kex **m_pkex;
79 pid_t m_pid; 76 pid_t m_pid;
80}; 77};
81 78
82struct monitor *monitor_init(void); 79struct monitor *monitor_init(void);
83void monitor_reinit(struct monitor *); 80void monitor_reinit(struct monitor *);
84void monitor_sync(struct monitor *);
85 81
86struct Authctxt; 82struct Authctxt;
87void monitor_child_preauth(struct Authctxt *, struct monitor *); 83void monitor_child_preauth(struct Authctxt *, struct monitor *);