summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--monitor.c5
-rw-r--r--sshconnect2.c4
3 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 448c968c7..a76c408f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
3 - dtucker@cvs.openbsd.org 2012/06/21 00:16:07 3 - dtucker@cvs.openbsd.org 2012/06/21 00:16:07
4 [addrmatch.c] 4 [addrmatch.c]
5 fix strlcpy truncation check. from carsten at debian org, ok markus 5 fix strlcpy truncation check. from carsten at debian org, ok markus
6 - dtucker@cvs.openbsd.org 2012/06/22 12:30:26
7 [monitor.c sshconnect2.c]
8 remove dead code following 'for (;;)' loops.
9 From Steve.McClellan at radisys com, ok markus@
6 10
720120628 1120120628
8 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null 12 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null
diff --git a/monitor.c b/monitor.c
index e7abf2498..e9802a3fd 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.116 2012/01/05 00:16:56 djm Exp $ */ 1/* $OpenBSD: monitor.c,v 1.117 2012/06/22 12:30:26 dtucker Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -479,9 +479,6 @@ monitor_child_postauth(struct monitor *pmonitor)
479 479
480 for (;;) 480 for (;;)
481 monitor_read(pmonitor, mon_dispatch, NULL); 481 monitor_read(pmonitor, mon_dispatch, NULL);
482
483 close(pmonitor->m_sendfd);
484 pmonitor->m_sendfd = -1;
485} 482}
486 483
487void 484void
diff --git a/sshconnect2.c b/sshconnect2.c
index c24b20278..7c369d743 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.188 2011/05/24 07:15:47 djm Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.189 2012/06/22 12:30:26 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -1893,8 +1893,6 @@ authmethod_get(char *authlist)
1893 return current; 1893 return current;
1894 } 1894 }
1895 } 1895 }
1896 if (name != NULL)
1897 xfree(name);
1898} 1896}
1899 1897
1900static char * 1898static char *