diff options
author | Damien Miller <djm@mindrot.org> | 2000-10-16 12:14:42 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-10-16 12:14:42 +1100 |
commit | 50a41ed079629fdcd9a1d2a781b73170422fc73a (patch) | |
tree | dbac99a364edff124412c16f079975a2e89a0389 /servconf.h | |
parent | 5993935f76e66c957f02efaa8fc0c8ff8a3f92c9 (diff) |
- (djm) Sync with OpenBSD:
- markus@cvs.openbsd.org 2000/10/14 04:01:15
[cipher.c]
debug3
- markus@cvs.openbsd.org 2000/10/14 04:07:23
[scp.c]
remove spaces from arguments; from djm@mindrot.org
- markus@cvs.openbsd.org 2000/10/14 06:09:46
[ssh.1]
Cipher is for SSH-1 only
- markus@cvs.openbsd.org 2000/10/14 06:12:09
[servconf.c servconf.h serverloop.c session.c sshd.8]
AllowTcpForwarding; from naddy@
- markus@cvs.openbsd.org 2000/10/14 06:16:56
[auth2.c compat.c compat.h sshconnect2.c version.h]
OpenSSH_2.3; note that is is not complete, but the version number
needs to be changed for interoperability reasons
- markus@cvs.openbsd.org 2000/10/14 06:19:45
[auth-rsa.c]
do not send RSA challenge if key is not allowed by key-options; from
eivind@ThinkSec.com
- markus@cvs.openbsd.org 2000/10/15 08:14:01
[rijndael.c session.c]
typos; from stevesk@sweden.hp.com
- markus@cvs.openbsd.org 2000/10/15 08:18:31
[rijndael.c]
typo
- Copy manpages back over from OpenBSD - too tedious to wade through diffs
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h index ef0790c7b..0188b9b89 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -11,7 +11,7 @@ | |||
11 | * called by a name other than "ssh" or "Secure Shell". | 11 | * called by a name other than "ssh" or "Secure Shell". |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /* RCSID("$OpenBSD: servconf.h,v 1.29 2000/10/11 20:14:39 markus Exp $"); */ | 14 | /* RCSID("$OpenBSD: servconf.h,v 1.30 2000/10/14 12:12:09 markus Exp $"); */ |
15 | 15 | ||
16 | #ifndef SERVCONF_H | 16 | #ifndef SERVCONF_H |
17 | #define SERVCONF_H | 17 | #define SERVCONF_H |
@@ -86,6 +86,7 @@ typedef struct { | |||
86 | int permit_empty_passwd; /* If false, do not permit empty | 86 | int permit_empty_passwd; /* If false, do not permit empty |
87 | * passwords. */ | 87 | * passwords. */ |
88 | int use_login; /* If true, login(1) is used */ | 88 | int use_login; /* If true, login(1) is used */ |
89 | int allow_tcp_forwarding; | ||
89 | unsigned int num_allow_users; | 90 | unsigned int num_allow_users; |
90 | char *allow_users[MAX_ALLOW_USERS]; | 91 | char *allow_users[MAX_ALLOW_USERS]; |
91 | unsigned int num_deny_users; | 92 | unsigned int num_deny_users; |