diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
commit | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (patch) | |
tree | 28fc9a13eaab935e4de055b561b333d67387a934 /servconf.h | |
parent | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
import openssh-4.3p2-gsskex-20060223.patch
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h index 3e4e07e08..0ef05bcd9 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.71 2004/12/23 23:11:00 djm Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.72 2005/12/06 22:38:27 reyk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -134,7 +134,10 @@ typedef struct { | |||
134 | 134 | ||
135 | char *authorized_keys_file; /* File containing public keys */ | 135 | char *authorized_keys_file; /* File containing public keys */ |
136 | char *authorized_keys_file2; | 136 | char *authorized_keys_file2; |
137 | |||
137 | int use_pam; /* Enable auth via PAM */ | 138 | int use_pam; /* Enable auth via PAM */ |
139 | |||
140 | int permit_tun; | ||
138 | } ServerOptions; | 141 | } ServerOptions; |
139 | 142 | ||
140 | void initialize_server_options(ServerOptions *); | 143 | void initialize_server_options(ServerOptions *); |