diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-09-29 22:01:10 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-09-29 22:01:10 +1000 |
commit | 372c8fbe9be87789106fb004ea684a65984712e9 (patch) | |
tree | 9b597e709ce657cd53e9ddd8bb4924ad88fa974b | |
parent | 7b1e69584611837d58f2651ec4e90210e1b26afe (diff) |
- (dtucker) [monitor_wrap.c] Remove duplicate definition of loginmsg
introduced during sync.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | monitor_wrap.c | 1 |
2 files changed, 5 insertions, 2 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20050929 | ||
2 | - (dtucker) [monitor_wrap.c] Remove duplicate definition of loginmsg | ||
3 | introduced during sync. | ||
4 | |||
1 | 20050928 | 5 | 20050928 |
2 | - (dtucker) [entropy.c] Use u_char for receiving RNG seed for consistency. | 6 | - (dtucker) [entropy.c] Use u_char for receiving RNG seed for consistency. |
3 | - (dtucker) [auth-pam.c] Bug #1028: send final non-query messages from | 7 | - (dtucker) [auth-pam.c] Bug #1028: send final non-query messages from |
@@ -3025,4 +3029,4 @@ | |||
3025 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3029 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3026 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3030 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3027 | 3031 | ||
3028 | $Id: ChangeLog,v 1.3898 2005/09/28 12:33:27 dtucker Exp $ | 3032 | $Id: ChangeLog,v 1.3899 2005/09/29 12:01:10 dtucker Exp $ |
diff --git a/monitor_wrap.c b/monitor_wrap.c index 1489e7f08..3b50753de 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -72,7 +72,6 @@ extern struct monitor *pmonitor; | |||
72 | extern Buffer input, output; | 72 | extern Buffer input, output; |
73 | extern Buffer loginmsg; | 73 | extern Buffer loginmsg; |
74 | extern ServerOptions options; | 74 | extern ServerOptions options; |
75 | extern Buffer loginmsg; | ||
76 | 75 | ||
77 | int | 76 | int |
78 | mm_is_monitor(void) | 77 | mm_is_monitor(void) |