summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2012-06-22 12:30:27 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2012-06-22 12:30:27 +0000
commit8fc2130e3db1efed855a8b8cc89eb062891d619e (patch)
tree8b0df2d563bd6f54e044926bef48ca8fa40767d0 /usr.bin/ssh
parent248031f1b4553090b52faf61e09ab97538745d6b (diff)
remove dead code following 'for (;;)' loops.
From Steve.McClellan at radisys com, ok markus@
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/monitor.c5
-rw-r--r--usr.bin/ssh/sshconnect2.c4
2 files changed, 2 insertions, 7 deletions
diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c
index a46c3f38928..d8dfe615b1a 100644
--- a/usr.bin/ssh/monitor.c
+++ b/usr.bin/ssh/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 <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -387,9 +387,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/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c
index 98bf6882f0a..7b90582d767 100644
--- a/usr.bin/ssh/sshconnect2.c
+++ b/usr.bin/ssh/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.
@@ -1887,8 +1887,6 @@ authmethod_get(char *authlist)
return current;
}
}
- if (name != NULL)
- xfree(name);
}
static char *