- (djm) Big OpenBSD sync:

[openssh.git] / auth-rh-rsa.c

diff --git a/auth-rh-rsa.c b/auth-rh-rsa.c
index 4386758d0ffb012ed45075a0180191ddd940e4be..3070c9d4138885743f64da1dad2efefc512bd674 100644 (file)
--- a/auth-rh-rsa.c
+++ b/auth-rh-rsa.c
@@ -1,21 +1,19 @@
 /*
- *
- * 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.
  *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-rh-rsa.c,v 1.14 2000/06/20 01:39:38 markus Exp $");
+RCSID("$OpenBSD: auth-rh-rsa.c,v 1.17 2000/10/03 18:03:03 markus Exp $");
 
 #include "packet.h"
 #include "ssh.h"
@@ -41,9 +39,9 @@ auth_rhosts_rsa(struct passwd *pw, const char *client_user, RSA *client_host_key
        HostStatus host_status;
        Key *client_key, *found;
 
-       debug("Trying rhosts with RSA host authentication for %.100s", client_user);
+       debug("Trying rhosts with RSA host authentication for client user %.100s", client_user);
 
-       if (client_host_key == NULL)
+       if (pw == NULL || client_host_key == NULL)
                return 0;
 
        /* Check if we would accept it using rhosts authentication. */