diff options
author | Damien Miller <djm@mindrot.org> | 1999-11-12 11:33:04 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-11-12 11:33:04 +1100 |
commit | 322650927bec37d850a3ab72f82bda1cd49b09e4 (patch) | |
tree | cb0bd087fb2f709f4d070221479249d8102e14bf /ssh.h | |
parent | 776af5de4f7f2aa938cdd17bf85a9c891ce7dbd9 (diff) |
- Merged changes from OpenBSD CVS
- [sshd.c] session_key_int may be zero
- [auth-rh-rsa.c servconf.c servconf.h ssh.h sshd.8 sshd.c sshd_config]
IgnoreUserKnownHosts(default=no), used for RhostRSAAuth, ok
deraadt,millert
- Brought default sshd_config more in line with OpenBSDs
Diffstat (limited to 'ssh.h')
-rw-r--r-- | ssh.h | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -13,7 +13,7 @@ Generic header file for ssh. | |||
13 | 13 | ||
14 | */ | 14 | */ |
15 | 15 | ||
16 | /* RCSID("$Id: ssh.h,v 1.10 1999/11/11 06:57:40 damien Exp $"); */ | 16 | /* RCSID("$Id: ssh.h,v 1.11 1999/11/12 00:33:04 damien Exp $"); */ |
17 | 17 | ||
18 | #ifndef SSH_H | 18 | #ifndef SSH_H |
19 | #define SSH_H | 19 | #define SSH_H |
@@ -138,8 +138,8 @@ only by root, whereas ssh_config should be world-readable. */ | |||
138 | #define SSH_AUTHSOCKET_ENV_NAME "SSH_AUTH_SOCK" | 138 | #define SSH_AUTHSOCKET_ENV_NAME "SSH_AUTH_SOCK" |
139 | 139 | ||
140 | /* Name of the environment variable containing the pathname of the | 140 | /* Name of the environment variable containing the pathname of the |
141 | authentication socket. */ | 141 | authentication socket. */ |
142 | #define SSH_AGENTPID_ENV_NAME "SSH_AGENT_PID" | 142 | #define SSH_AGENTPID_ENV_NAME "SSH_AGENT_PID" |
143 | 143 | ||
144 | /* Force host key length and server key length to differ by at least this | 144 | /* Force host key length and server key length to differ by at least this |
145 | many bits. This is to make double encryption with rsaref work. */ | 145 | many bits. This is to make double encryption with rsaref work. */ |
@@ -334,8 +334,7 @@ int auth_rhosts(struct passwd *pw, const char *client_user, | |||
334 | its host key. Returns true if authentication succeeds. */ | 334 | its host key. Returns true if authentication succeeds. */ |
335 | int auth_rhosts_rsa(struct passwd *pw, const char *client_user, | 335 | int auth_rhosts_rsa(struct passwd *pw, const char *client_user, |
336 | unsigned int bits, BIGNUM *client_host_key_e, | 336 | unsigned int bits, BIGNUM *client_host_key_e, |
337 | BIGNUM *client_host_key_n, int ignore_rhosts, | 337 | BIGNUM *client_host_key_n); |
338 | int strict_modes); | ||
339 | 338 | ||
340 | /* Tries to authenticate the user using password. Returns true if | 339 | /* Tries to authenticate the user using password. Returns true if |
341 | authentication succeeds. */ | 340 | authentication succeeds. */ |