diff options
| author |   markus <markus@openbsd.org> | 1999-11-02 19:10:14 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 1999-11-02 19:10:14 +0000 |
| commit | bcc380c6692a18bd85906a2acd25517f4b24510f (patch) | |
| tree | 993a274f0630d919af116856f77d682abe3bf575 | |
| parent | support usermode disasm (diff) | |
| download | wireguard-openbsd-bcc380c6692a18bd85906a2acd25517f4b24510f.tar.xz wireguard-openbsd-bcc380c6692a18bd85906a2acd25517f4b24510f.zip | |
remove unused argument. ok dugsong
| -rw-r--r-- | usr.bin/ssh/auth-krb4.c | 7 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh.h | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd.c | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/usr.bin/ssh/auth-krb4.c b/usr.bin/ssh/auth-krb4.c index 52952927ffc..569f0b4c3b3 100644 --- a/usr.bin/ssh/auth-krb4.c +++ b/usr.bin/ssh/auth-krb4.c @@ -6,7 +6,7 @@ Kerberos v4 authentication and ticket-passing routines. - $Id: auth-krb4.c,v 1.4 1999/10/01 18:18:40 deraadt Exp $ + $Id: auth-krb4.c,v 1.5 1999/11/02 19:10:14 markus Exp $ */ #include "includes.h" @@ -171,11 +171,12 @@ auth_kerberos_tgt_failure: return 0; } -int auth_afs_token(char *server_user, uid_t uid, const char *string) +int auth_afs_token(struct passwd *pw, const char *token_string) { CREDENTIALS creds; + uid_t uid = pw->pw_uid; - if (!radix_to_creds(string, &creds)) { + if (!radix_to_creds(token_string, &creds)) { log("Protocol error decoding AFS token"); packet_send_debug("Protocol error decoding AFS token"); packet_start(SSH_SMSG_FAILURE); diff --git a/usr.bin/ssh/ssh.h b/usr.bin/ssh/ssh.h index e30f74d2fc6..62b1ca3188e 100644 --- a/usr.bin/ssh/ssh.h +++ b/usr.bin/ssh/ssh.h @@ -13,7 +13,7 @@ Generic header file for ssh. */ -/* RCSID("$Id: ssh.h,v 1.15 1999/10/28 08:43:10 markus Exp $"); */ +/* RCSID("$Id: ssh.h,v 1.16 1999/11/02 19:10:15 markus Exp $"); */ #ifndef SSH_H #define SSH_H @@ -574,7 +574,7 @@ int ssh_tf_init(uid_t uid); /* Accept passed Kerberos v4 ticket-granting ticket and AFS tokens. */ int auth_kerberos_tgt(struct passwd *pw, const char *string); -int auth_afs_token(char *server_user, uid_t uid, const char *string); +int auth_afs_token(struct passwd *pw, const char *token_string); int creds_to_radix(CREDENTIALS *creds, unsigned char *buf); int radix_to_creds(const char *buf, CREDENTIALS *creds); diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 5f85f99d35e..78fb2a25c73 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -18,7 +18,7 @@ agent connections. */ #include "includes.h" -RCSID("$Id: sshd.c,v 1.42 1999/11/02 00:08:42 markus Exp $"); +RCSID("$Id: sshd.c,v 1.43 1999/11/02 19:10:15 markus Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -1128,7 +1128,7 @@ do_authentication(char *user, int privileged_port) int dlen; char *token_string = packet_get_string(&dlen); packet_integrity_check(plen, 4 + dlen, type); - if (!auth_afs_token(user, pw->pw_uid, token_string)) + if (!auth_afs_token(pw, token_string)) debug("AFS token REFUSED for %s", user); xfree(token_string); continue; |