diff options
author | kris <kris@FreeBSD.org> | 2000-05-15 05:24:25 +0000 |
---|---|---|
committer | kris <kris@FreeBSD.org> | 2000-05-15 05:24:25 +0000 |
commit | a632b4789caf015f977f45e2d106cc00efa1239f (patch) | |
tree | eb8a772c0dc7204d341277f265caa0c7c543c32c /crypto/openssh/auth-rh-rsa.c | |
parent | 8cf8ce7bb13515db269566309a8e9cd8b309ee56 (diff) | |
download | FreeBSD-src-a632b4789caf015f977f45e2d106cc00efa1239f.zip FreeBSD-src-a632b4789caf015f977f45e2d106cc00efa1239f.tar.gz |
Resolve conflicts and update for FreeBSD.
Diffstat (limited to 'crypto/openssh/auth-rh-rsa.c')
-rw-r--r-- | crypto/openssh/auth-rh-rsa.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/openssh/auth-rh-rsa.c b/crypto/openssh/auth-rh-rsa.c index 19e5cbb..92405bb 100644 --- a/crypto/openssh/auth-rh-rsa.c +++ b/crypto/openssh/auth-rh-rsa.c @@ -1,14 +1,14 @@ /* - * + * * auth-rh-rsa.c - * + * * Author: Tatu Ylonen <ylo@cs.hut.fi> - * + * * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved - * + * * Created: Sun May 7 03:08:06 1995 ylo - * + * * Rhosts or /etc/hosts.equiv authentication combined with RSA host * authentication. * @@ -16,7 +16,7 @@ */ #include "includes.h" -RCSID("$Id: auth-rh-rsa.c,v 1.11 2000/03/23 22:15:33 markus Exp $"); +RCSID("$Id: auth-rh-rsa.c,v 1.13 2000/04/14 10:30:29 markus Exp $"); #include "packet.h" #include "ssh.h" @@ -34,7 +34,7 @@ RCSID("$Id: auth-rh-rsa.c,v 1.11 2000/03/23 22:15:33 markus Exp $"); * its host key. Returns true if authentication succeeds. */ -int +int auth_rhosts_rsa(struct passwd *pw, const char *client_user, RSA *client_host_key) { extern ServerOptions options; |