diff options
| author | des <des@FreeBSD.org> | 2002-06-23 16:09:08 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-06-23 16:09:08 +0000 |
| commit | fa8aa6dfe7e9aaab9f8fa1e3290e7242fc12d83d (patch) | |
| tree | cc93abce4a81ab84afa26d861b756d5c77818afa /crypto/openssh/ssh.h | |
| parent | e9f3540c66a76052e51a348bdd05a068d0855d3d (diff) | |
| download | FreeBSD-src-fa8aa6dfe7e9aaab9f8fa1e3290e7242fc12d83d.zip FreeBSD-src-fa8aa6dfe7e9aaab9f8fa1e3290e7242fc12d83d.tar.gz | |
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
Diffstat (limited to 'crypto/openssh/ssh.h')
| -rw-r--r-- | crypto/openssh/ssh.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/crypto/openssh/ssh.h b/crypto/openssh/ssh.h index 6848e1e..fd9fd50 100644 --- a/crypto/openssh/ssh.h +++ b/crypto/openssh/ssh.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.h,v 1.64 2002/03/04 17:27:39 stevesk Exp $ */ +/* $OpenBSD: ssh.h,v 1.70 2002/06/03 12:04:07 deraadt Exp $ */ /* $FreeBSD$ */ /* @@ -32,7 +32,7 @@ #define SSH_MAX_IDENTITY_FILES 100 /* - * Major protocol version. Different version indicates major incompatiblity + * Major protocol version. Different version indicates major incompatibility * that prevents communication. * * Minor protocol version. Different version indicates minor incompatibility @@ -86,6 +86,16 @@ /* Used to identify ``EscapeChar none'' */ #define SSH_ESCAPECHAR_NONE -2 +/* + * unprivileged user when UsePrivilegeSeparation=yes; + * sshd will change its privileges to this user and its + * primary group. + */ +#define SSH_PRIVSEP_USER "sshd" + +/* Minimum modulus size (n) for RSA keys. */ +#define SSH_RSA_MINIMUM_MODULUS_SIZE 768 + #ifdef USE_PAM #include "auth-pam.h" #endif /* USE_PAM */ |
