=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/auth-rh-rsa.c,v retrieving revision 1.34.6.2 retrieving revision 1.35 diff -u -r1.34.6.2 -r1.35 --- src/usr.bin/ssh/Attic/auth-rh-rsa.c 2004/03/04 18:18:15 1.34.6.2 +++ src/usr.bin/ssh/Attic/auth-rh-rsa.c 2003/04/08 20:21:28 1.35 @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-rh-rsa.c,v 1.34.6.2 2004/03/04 18:18:15 brad Exp $"); +RCSID("$OpenBSD: auth-rh-rsa.c,v 1.35 2003/04/08 20:21:28 itojun Exp $"); #include "packet.h" #include "uidswap.h" @@ -52,19 +52,18 @@ * its host key. Returns true if authentication succeeds. */ int -auth_rhosts_rsa(Authctxt *authctxt, char *cuser, Key *client_host_key) +auth_rhosts_rsa(struct passwd *pw, char *cuser, Key *client_host_key) { char *chost; - struct passwd *pw = authctxt->pw; debug("Trying rhosts with RSA host authentication for client user %.100s", cuser); - if (!authctxt->valid || client_host_key == NULL || + if (pw == NULL || client_host_key == NULL || client_host_key->rsa == NULL) return 0; - chost = (char *)get_canonical_hostname(options.use_dns); + chost = (char *)get_canonical_hostname(options.verify_reverse_mapping); debug("Rhosts RSA authentication: canonical host %.900s", chost); if (!PRIVSEP(auth_rhosts_rsa_key_allowed(pw, cuser, chost, client_host_key))) {