diff options
author | Damien Miller <djm@mindrot.org> | 1999-12-06 11:47:28 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-12-06 11:47:28 +1100 |
commit | aae6c614da614eb10ced16505f35410671c95d9d (patch) | |
tree | 441e578781d38e7de4c5f609a4f86695d937e640 /ssh.h | |
parent | dc33fc3910552c82518503b581efc1a51192fa76 (diff) |
- Merged OpenBSD CVS changes:
- [auth-krb4.c auth-passwd.c auth-skey.c ssh.
move skey-auth from auth-passwd.c to auth-s
- [auth-rsa.c]
warn only about mismatch if key is _used_
warn about keysize-mismatch with log() not
channels.c readconf.c readconf.h ssh.c ssh.
ports are u_short
- [hostfile.c]
indent, shorter warning
- [nchan.c]
use error() for internal errors
- [packet.c]
set loglevel for SSH_MSG_DISCONNECT to log(
serverloop.c
indent
- [ssh-add.1 ssh-add.c ssh.h]
document , reasonable default
- [ssh.1]
CheckHostIP is not available for connects v
- [sshconnect.c]
typo
easier to read client code for passwd and s
turn of checkhostip for proxy connects, sin
Diffstat (limited to 'ssh.h')
-rw-r--r-- | ssh.h | 21 |
1 files changed, 15 insertions, 6 deletions
@@ -13,7 +13,7 @@ | |||
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | /* RCSID("$Id: ssh.h,v 1.16 1999/11/25 00:54:59 damien Exp $"); */ | 16 | /* RCSID("$Id: ssh.h,v 1.17 1999/12/06 00:47:29 damien Exp $"); */ |
17 | 17 | ||
18 | #ifndef SSH_H | 18 | #ifndef SSH_H |
19 | #define SSH_H | 19 | #define SSH_H |
@@ -170,6 +170,13 @@ | |||
170 | #define SSH_AGENTPID_ENV_NAME "SSH_AGENT_PID" | 170 | #define SSH_AGENTPID_ENV_NAME "SSH_AGENT_PID" |
171 | 171 | ||
172 | /* | 172 | /* |
173 | * Default path to ssh-askpass used by ssh-add, | ||
174 | * environment variable for overwriting the default location | ||
175 | */ | ||
176 | #define SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass" | ||
177 | #define SSH_ASKPASS_ENV "SSH_ASKPASS" | ||
178 | |||
179 | /* | ||
173 | * Force host key length and server key length to differ by at least this | 180 | * Force host key length and server key length to differ by at least this |
174 | * many bits. This is to make double encryption with rsaref work. | 181 | * many bits. This is to make double encryption with rsaref work. |
175 | */ | 182 | */ |
@@ -294,7 +301,7 @@ void record_logout(int pid, const char *ttyname); | |||
294 | */ | 301 | */ |
295 | int | 302 | int |
296 | ssh_connect(const char *host, struct sockaddr_in * hostaddr, | 303 | ssh_connect(const char *host, struct sockaddr_in * hostaddr, |
297 | int port, int connection_attempts, | 304 | u_short port, int connection_attempts, |
298 | int anonymous, uid_t original_real_uid, | 305 | int anonymous, uid_t original_real_uid, |
299 | const char *proxy_command); | 306 | const char *proxy_command); |
300 | 307 | ||
@@ -579,8 +586,8 @@ char *channel_open_message(void); | |||
579 | * error. | 586 | * error. |
580 | */ | 587 | */ |
581 | void | 588 | void |
582 | channel_request_local_forwarding(int port, const char *host, | 589 | channel_request_local_forwarding(u_short port, const char *host, |
583 | int remote_port); | 590 | u_short remote_port); |
584 | 591 | ||
585 | /* | 592 | /* |
586 | * Initiate forwarding of connections to port "port" on remote host through | 593 | * Initiate forwarding of connections to port "port" on remote host through |
@@ -589,8 +596,8 @@ channel_request_local_forwarding(int port, const char *host, | |||
589 | * permitted. | 596 | * permitted. |
590 | */ | 597 | */ |
591 | void | 598 | void |
592 | channel_request_remote_forwarding(int port, const char *host, | 599 | channel_request_remote_forwarding(u_short port, const char *host, |
593 | int remote_port); | 600 | u_short remote_port); |
594 | 601 | ||
595 | /* | 602 | /* |
596 | * Permits opening to any host/port in SSH_MSG_PORT_OPEN. This is usually | 603 | * Permits opening to any host/port in SSH_MSG_PORT_OPEN. This is usually |
@@ -704,6 +711,7 @@ struct envstring { | |||
704 | int auth_krb4(const char *server_user, KTEXT auth, char **client); | 711 | int auth_krb4(const char *server_user, KTEXT auth, char **client); |
705 | int krb4_init(uid_t uid); | 712 | int krb4_init(uid_t uid); |
706 | void krb4_cleanup_proc(void *ignore); | 713 | void krb4_cleanup_proc(void *ignore); |
714 | int auth_krb4_password(struct passwd * pw, const char *password); | ||
707 | 715 | ||
708 | #ifdef AFS | 716 | #ifdef AFS |
709 | #include <kafs.h> | 717 | #include <kafs.h> |
@@ -721,6 +729,7 @@ int radix_to_creds(const char *buf, CREDENTIALS * creds); | |||
721 | #ifdef SKEY | 729 | #ifdef SKEY |
722 | #include <skey.h> | 730 | #include <skey.h> |
723 | char *skey_fake_keyinfo(char *username); | 731 | char *skey_fake_keyinfo(char *username); |
732 | int auth_skey_password(struct passwd * pw, const char *password); | ||
724 | #endif /* SKEY */ | 733 | #endif /* SKEY */ |
725 | 734 | ||
726 | #endif /* SSH_H */ | 735 | #endif /* SSH_H */ |