diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-22 01:43:59 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-22 01:43:59 +0000 |
commit | 46c162204b5a6f7471525c2f75cb2c607c88b83f (patch) | |
tree | 9041b006ab612c18bdb16b606601839a00ca5b2c /ssh.h | |
parent | a074feb65d6f1fcad02e80b751e2287fd6230b09 (diff) |
One way to massive patch. <sigh> It compiles and works under Linux..
And I think I have all the bits right from the OpenBSD tree.
20001222
- Updated RCSID for pty.c
- (bal) OpenBSD CVS Updates:
- markus@cvs.openbsd.org 2000/12/21 15:10:16
[auth-rh-rsa.c hostfile.c hostfile.h sshconnect.c]
print keyfile:line for changed hostkeys, for deraadt@, ok deraadt@
- markus@cvs.openbsd.org 2000/12/20 19:26:56
[authfile.c]
allow ssh -i userkey for root
- markus@cvs.openbsd.org 2000/12/20 19:37:21
[authfd.c authfd.h kex.c sshconnect2.c sshd.c uidswap.c uidswap.h]
fix prototypes; from stevesk@pobox.com
- markus@cvs.openbsd.org 2000/12/20 19:32:08
[sshd.c]
init pointer to NULL; report from Jan.Ivan@cern.ch
- markus@cvs.openbsd.org 2000/12/19 23:17:54
[auth-krb4.c auth-options.c auth-options.h auth-rhosts.c auth-rsa.c
auth1.c auth2-skey.c auth2.c authfd.c authfd.h authfile.c bufaux.c
bufaux.h buffer.c canohost.c channels.c clientloop.c compress.c
crc32.c deattack.c getput.h hmac.c hmac.h hostfile.c kex.c kex.h
key.c key.h log.c login.c match.c match.h mpaux.c mpaux.h packet.c
packet.h radix.c readconf.c rsa.c scp.c servconf.c servconf.h
serverloop.c session.c sftp-server.c ssh-agent.c ssh-dss.c ssh-dss.h
ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh-rsa.h ssh.c ssh.h uuencode.c
uuencode.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c]
replace 'unsigned bla' with 'u_bla' everywhere. also replace 'char
unsigned' with u_char.
Diffstat (limited to 'ssh.h')
-rw-r--r-- | ssh.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -12,7 +12,7 @@ | |||
12 | * called by a name other than "ssh" or "Secure Shell". | 12 | * called by a name other than "ssh" or "Secure Shell". |
13 | */ | 13 | */ |
14 | 14 | ||
15 | /* RCSID("$OpenBSD: ssh.h,v 1.55 2000/11/25 17:19:33 markus Exp $"); */ | 15 | /* RCSID("$OpenBSD: ssh.h,v 1.56 2000/12/19 23:17:58 markus Exp $"); */ |
16 | 16 | ||
17 | #ifndef SSH_H | 17 | #ifndef SSH_H |
18 | #define SSH_H | 18 | #define SSH_H |
@@ -296,9 +296,9 @@ | |||
296 | * information is not available. This must be called before record_login. | 296 | * information is not available. This must be called before record_login. |
297 | * The host from which the user logged in is stored in buf. | 297 | * The host from which the user logged in is stored in buf. |
298 | */ | 298 | */ |
299 | unsigned long | 299 | u_long |
300 | get_last_login_time(uid_t uid, const char *logname, | 300 | get_last_login_time(uid_t uid, const char *logname, |
301 | char *buf, unsigned int bufsize); | 301 | char *buf, u_int bufsize); |
302 | 302 | ||
303 | /* | 303 | /* |
304 | * Records that the user has logged in. This does many things normally done | 304 | * Records that the user has logged in. This does many things normally done |
@@ -377,7 +377,7 @@ int auth_rsa(struct passwd * pw, BIGNUM * client_n); | |||
377 | * Parses an RSA key (number of bits, e, n) from a string. Moves the pointer | 377 | * Parses an RSA key (number of bits, e, n) from a string. Moves the pointer |
378 | * over the key. Skips any whitespace at the beginning and at end. | 378 | * over the key. Skips any whitespace at the beginning and at end. |
379 | */ | 379 | */ |
380 | int auth_rsa_read_key(char **cpp, unsigned int *bitsp, BIGNUM * e, BIGNUM * n); | 380 | int auth_rsa_read_key(char **cpp, u_int *bitsp, BIGNUM * e, BIGNUM * n); |
381 | 381 | ||
382 | /* | 382 | /* |
383 | * Returns the name of the machine at the other end of the socket. The | 383 | * Returns the name of the machine at the other end of the socket. The |
@@ -543,7 +543,7 @@ int auth_krb4_password(struct passwd * pw, const char *password); | |||
543 | int auth_kerberos_tgt(struct passwd * pw, const char *string); | 543 | int auth_kerberos_tgt(struct passwd * pw, const char *string); |
544 | int auth_afs_token(struct passwd * pw, const char *token_string); | 544 | int auth_afs_token(struct passwd * pw, const char *token_string); |
545 | 545 | ||
546 | int creds_to_radix(CREDENTIALS * creds, unsigned char *buf, size_t buflen); | 546 | int creds_to_radix(CREDENTIALS * creds, u_char *buf, size_t buflen); |
547 | int radix_to_creds(const char *buf, CREDENTIALS * creds); | 547 | int radix_to_creds(const char *buf, CREDENTIALS * creds); |
548 | #endif /* AFS */ | 548 | #endif /* AFS */ |
549 | 549 | ||