===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/readconf.c,v
retrieving revision 1.148.2.1
retrieving revision 1.149
diff -u -r1.148.2.1 -r1.149
--- src/usr.bin/ssh/readconf.c	2006/09/30 04:06:51	1.148.2.1
+++ src/usr.bin/ssh/readconf.c	2006/03/19 02:24:05	1.149
@@ -1,4 +1,3 @@
-/* $OpenBSD: readconf.c,v 1.148.2.1 2006/09/30 04:06:51 brad Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -12,31 +11,23 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
+#include "includes.h"
+RCSID("$OpenBSD: readconf.c,v 1.149 2006/03/19 02:24:05 djm Exp $");
+
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/socket.h>
 
-#include <netinet/in.h>
-
 #include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 
-#include "xmalloc.h"
 #include "ssh.h"
+#include "xmalloc.h"
 #include "compat.h"
 #include "cipher.h"
 #include "pathnames.h"
 #include "log.h"
-#include "key.h"
 #include "readconf.h"
 #include "match.h"
 #include "misc.h"
-#include "buffer.h"
 #include "kex.h"
 #include "mac.h"
 
@@ -108,7 +99,6 @@
 typedef enum {
 	oBadOption,
 	oForwardAgent, oForwardX11, oForwardX11Trusted, oGatewayPorts,
-	oExitOnForwardFailure,
 	oPasswordAuthentication, oRSAAuthentication,
 	oChallengeResponseAuthentication, oXAuthLocation,
 	oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,
@@ -139,7 +129,6 @@
 	{ "forwardagent", oForwardAgent },
 	{ "forwardx11", oForwardX11 },
 	{ "forwardx11trusted", oForwardX11Trusted },
-	{ "exitonforwardfailure", oExitOnForwardFailure },
 	{ "xauthlocation", oXAuthLocation },
 	{ "gatewayports", oGatewayPorts },
 	{ "useprivilegedport", oUsePrivilegedPort },
@@ -392,10 +381,6 @@
 		intptr = &options->gateway_ports;
 		goto parse_flag;
 
-	case oExitOnForwardFailure:
-		intptr = &options->exit_on_forward_failure;
-		goto parse_flag;
-
 	case oUsePrivilegedPort:
 		intptr = &options->use_privileged_port;
 		goto parse_flag;
@@ -997,7 +982,6 @@
 	options->forward_agent = -1;
 	options->forward_x11 = -1;
 	options->forward_x11_trusted = -1;
-	options->exit_on_forward_failure = -1;
 	options->xauth_location = NULL;
 	options->gateway_ports = -1;
 	options->use_privileged_port = -1;
@@ -1078,8 +1062,6 @@
 		options->forward_x11 = 0;
 	if (options->forward_x11_trusted == -1)
 		options->forward_x11_trusted = 0;
-	if (options->exit_on_forward_failure == -1)
-		options->exit_on_forward_failure = 0;
 	if (options->xauth_location == NULL)
 		options->xauth_location = _PATH_XAUTH;
 	if (options->gateway_ports == -1)