summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--readconf.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 54b4677c2..a843af0bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120130718
2 - (djm) OpenBSD CVS Sync
3 - dtucker@cvs.openbsd.org 2013/06/10 19:19:44
4 [readconf.c]
5 revert 1.203 while we investigate crashes reported by okan@
6
120130702 720130702
2 - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config 8 - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config
3 contrib/cygwin/ssh-user-config] Modernizes and improve readability of 9 contrib/cygwin/ssh-user-config] Modernizes and improve readability of
diff --git a/readconf.c b/readconf.c
index 7c1c795fe..1464430a4 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.c,v 1.203 2013/06/05 22:00:28 dtucker Exp $ */ 1/* $OpenBSD: readconf.c,v 1.204 2013/06/10 19:19:44 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -820,8 +820,6 @@ parse_int:
820 else if (opcode == oRemoteForward) 820 else if (opcode == oRemoteForward)
821 add_remote_forward(options, &fwd); 821 add_remote_forward(options, &fwd);
822 } 822 }
823 free(fwd.connect_host);
824 free(fwd.listen_host);
825 break; 823 break;
826 824
827 case oClearAllForwardings: 825 case oClearAllForwardings: