diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /monitor.h | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'monitor.h')
-rw-r--r-- | monitor.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor.h,v 1.15 2008/11/04 08:22:13 djm Exp $ */ | 1 | /* $OpenBSD: monitor.h,v 1.16 2011/06/17 21:44:31 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -74,6 +74,8 @@ struct mm_master; | |||
74 | struct monitor { | 74 | struct monitor { |
75 | int m_recvfd; | 75 | int m_recvfd; |
76 | int m_sendfd; | 76 | int m_sendfd; |
77 | int m_log_recvfd; | ||
78 | int m_log_sendfd; | ||
77 | struct mm_master *m_zback; | 79 | struct mm_master *m_zback; |
78 | struct mm_master *m_zlib; | 80 | struct mm_master *m_zlib; |
79 | struct Kex **m_pkex; | 81 | struct Kex **m_pkex; |