From 7c07891caf91823c65d0ed7f700a1cfe983e15cc Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Wed, 22 Mar 2006 20:41:37 +0000
Subject: Merge conflicts.

---
 crypto/openssh/readconf.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'crypto/openssh/readconf.h')

diff --git a/crypto/openssh/readconf.h b/crypto/openssh/readconf.h
index 2b9deb9..4565b2c 100644
--- a/crypto/openssh/readconf.h
+++ b/crypto/openssh/readconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: readconf.h,v 1.67 2005/06/08 11:25:09 djm Exp $	*/
+/*	$OpenBSD: readconf.h,v 1.68 2005/12/06 22:38:27 reyk Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -114,6 +114,14 @@ typedef struct {
 	int	control_master;
 
 	int	hash_known_hosts;
+
+	int	tun_open;	/* tun(4) */
+	int     tun_local;	/* force tun device (optional) */
+	int     tun_remote;	/* force tun device (optional) */
+
+	char	*local_command;
+	int	permit_local_command;
+
 }       Options;
 
 #define SSHCTL_MASTER_NO	0
-- 
cgit v1.1