summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-03-31 23:52:04 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-03-31 23:52:04 +1000
commitde0de39082ee971aa3ff442e0201d9eff5c75cca (patch)
treee595b205b43a2df188167d1089707ef3ee729d69
parent73ba43798a3e81149f65a03d51f23bf9fa928011 (diff)
- (dtucker) [monitor.c] Remaining part of fix for bug #1006.
-rw-r--r--ChangeLog3
-rw-r--r--monitor.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ba31bb80c..9fedb7fa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@
17 routines, originally reported by robvdwal at sara.nl. 17 routines, originally reported by robvdwal at sara.nl.
18 - (dtucker) [ssh.c] Prevent null pointer deref in port forwarding debug 18 - (dtucker) [ssh.c] Prevent null pointer deref in port forwarding debug
19 message on some platforms. Patch from pete at seebeyond.com via djm. 19 message on some platforms. Patch from pete at seebeyond.com via djm.
20 - (dtucker) [monitor.c] Remaining part of fix for bug #1006.
20 21
2120050329 2220050329
22 - (dtucker) [contrib/aix/buildbff.sh] Bug #1005: Look up only the user we're 23 - (dtucker) [contrib/aix/buildbff.sh] Bug #1005: Look up only the user we're
@@ -2407,4 +2408,4 @@
2407 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2408 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2408 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2409 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2409 2410
2410$Id: ChangeLog,v 1.3733 2005/03/31 11:51:54 dtucker Exp $ 2411$Id: ChangeLog,v 1.3734 2005/03/31 13:52:04 dtucker Exp $
diff --git a/monitor.c b/monitor.c
index 4dc11a275..c6a42e709 100644
--- a/monitor.c
+++ b/monitor.c
@@ -310,6 +310,8 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
310 authctxt = _authctxt; 310 authctxt = _authctxt;
311 memset(authctxt, 0, sizeof(*authctxt)); 311 memset(authctxt, 0, sizeof(*authctxt));
312 312
313 authctxt->loginmsg = &loginmsg;
314
313 if (compat20) { 315 if (compat20) {
314 mon_dispatch = mon_dispatch_proto20; 316 mon_dispatch = mon_dispatch_proto20;
315 317