From 5f58a877680d1c2c1a1b11e8e2b38353ed728327 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 30 Jun 2012 08:33:17 +1000 Subject: - dtucker@cvs.openbsd.org 2012/06/22 12:30:26 [monitor.c sshconnect2.c] remove dead code following 'for (;;)' loops. From Steve.McClellan at radisys com, ok markus@ --- ChangeLog | 4 ++++ monitor.c | 5 +---- sshconnect2.c | 4 +--- 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 @@ - dtucker@cvs.openbsd.org 2012/06/21 00:16:07 [addrmatch.c] fix strlcpy truncation check. from carsten at debian org, ok markus + - dtucker@cvs.openbsd.org 2012/06/22 12:30:26 + [monitor.c sshconnect2.c] + remove dead code following 'for (;;)' loops. + From Steve.McClellan at radisys com, ok markus@ 20120628 - (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 @@ -/* $OpenBSD: monitor.c,v 1.116 2012/01/05 00:16:56 djm Exp $ */ +/* $OpenBSD: monitor.c,v 1.117 2012/06/22 12:30:26 dtucker Exp $ */ /* * Copyright 2002 Niels Provos * Copyright 2002 Markus Friedl @@ -479,9 +479,6 @@ monitor_child_postauth(struct monitor *pmonitor) for (;;) monitor_read(pmonitor, mon_dispatch, NULL); - - close(pmonitor->m_sendfd); - pmonitor->m_sendfd = -1; } void diff --git a/sshconnect2.c b/sshconnect2.c index c24b20278..7c369d743 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.188 2011/05/24 07:15:47 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.189 2012/06/22 12:30:26 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1893,8 +1893,6 @@ authmethod_get(char *authlist) return current; } } - if (name != NULL) - xfree(name); } static char * -- cgit v1.2.3