diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-06-23 16:09:08 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-06-23 16:09:08 +0000 |
| commit | 80628bacb0b4bc1daaef4e038e755602c972bede (patch) | |
| tree | cc93abce4a81ab84afa26d861b756d5c77818afa /crypto/openssh/servconf.h | |
| parent | f191b6f96cdb3270a60bcb6219ce0998bdd25cde (diff) | |
| download | src-80628bacb0b4bc1daaef4e038e755602c972bede.tar.gz src-80628bacb0b4bc1daaef4e038e755602c972bede.zip | |
Resolve conflicts. Known issues:
- sshd fails to set TERM correctly.
- privilege separation may break PAM and is currently turned off.
- man pages have not yet been updated
I will have these issues resolved, and privilege separation turned on by
default, in time for DP2.
Sponsored by: DARPA, NAI Labs
Notes
Notes:
svn path=/head/; revision=98684
Diffstat (limited to 'crypto/openssh/servconf.h')
| -rw-r--r-- | crypto/openssh/servconf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/servconf.h b/crypto/openssh/servconf.h index d5bf6bea1142..862832ab69f2 100644 --- a/crypto/openssh/servconf.h +++ b/crypto/openssh/servconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.h,v 1.54 2002/03/04 17:27:39 stevesk Exp $ */ +/* $OpenBSD: servconf.h,v 1.58 2002/06/20 23:05:55 markus Exp $ */ /* $FreeBSD$ */ /* @@ -100,6 +100,7 @@ typedef struct { int permit_empty_passwd; /* If false, do not permit empty * passwords. */ int use_login; /* If true, login(1) is used */ + int compression; /* If true, compression is allowed */ int allow_tcp_forwarding; u_int num_allow_users; char *allow_users[MAX_ALLOW_USERS]; @@ -132,7 +133,6 @@ typedef struct { char *authorized_keys_file; /* File containing public keys */ char *authorized_keys_file2; - } ServerOptions; void initialize_server_options(ServerOptions *); |