diff options
| author | Damien Miller <djm@mindrot.org> | 2005-12-13 09:29:02 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2005-12-13 09:29:02 +0100 |
| commit | d27b947178df3689bfb7fdfb62a5f1337ef73481 (patch) | |
| tree | c8678325c355b3602bdabca16da1baa8707818eb /servconf.h | |
| parent | - jmc@cvs.openbsd.org 2005/11/30 11:45:20 (diff) | |
| download | openssh-d27b947178df3689bfb7fdfb62a5f1337ef73481.tar.xz openssh-d27b947178df3689bfb7fdfb62a5f1337ef73481.zip | |
- reyk@cvs.openbsd.org 2005/12/06 22:38:28
[auth-options.c auth-options.h channels.c channels.h clientloop.c]
[misc.c misc.h readconf.c readconf.h scp.c servconf.c servconf.h]
[serverloop.c sftp.c ssh.1 ssh.c ssh_config ssh_config.5 sshconnect.c]
[sshconnect.h sshd.8 sshd_config sshd_config.5]
Add support for tun(4) forwarding over OpenSSH, based on an idea and
initial channel code bits by markus@. This is a simple and easy way to
use OpenSSH for ad hoc virtual private network connections, e.g.
administrative tunnels or secure wireless access. It's based on a new
ssh channel and works similar to the existing TCP forwarding support,
except that it depends on the tun(4) network interface on both ends of
the connection for layer 2 or layer 3 tunneling. This diff also adds
support for LocalCommand in the ssh(1) client.
ok djm@, markus@, jmc@ (manpages), tested and discussed with others
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 f7e56d521..ab82c8f57 100644 --- a/servconf.h +++ b/servconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.h,v 1.71 2004/12/23 23:11:00 djm Exp $ */ +/* $OpenBSD: servconf.h,v 1.72 2005/12/06 22:38:27 reyk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -133,7 +133,10 @@ typedef struct { char *authorized_keys_file; /* File containing public keys */ char *authorized_keys_file2; + int use_pam; /* Enable auth via PAM */ + + int permit_tun; } ServerOptions; void initialize_server_options(ServerOptions *); |