- (tim) [configure.ac] Bug 1078. Fix --without-kerberos5. Reported by

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

diff --git a/auth-rh-rsa.c b/auth-rh-rsa.c
index d1b7ae996d50947a5aa46b572ec8bd018b74541d..c31f2b97b6b266cc5f1737d3c0ee3ee4b345d8f3 100644 (file)
--- a/auth-rh-rsa.c
+++ b/auth-rh-rsa.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-rh-rsa.c,v 1.29 2002/03/04 12:43:06 markus Exp $");
+RCSID("$OpenBSD: auth-rh-rsa.c,v 1.38 2005/07/17 07:17:54 djm Exp $");
 
 #include "packet.h"
 #include "uidswap.h"
@@ -25,37 +25,49 @@ RCSID("$OpenBSD: auth-rh-rsa.c,v 1.29 2002/03/04 12:43:06 markus Exp $");
 #include "auth.h"
 #include "canohost.h"
 
-/*
- * Tries to authenticate the user using the .rhosts file and the host using
- * its host key.  Returns true if authentication succeeds.
- */
+#include "monitor_wrap.h"
+
+/* import */
+extern ServerOptions options;
 
 int
-auth_rhosts_rsa(struct passwd *pw, const char *client_user, Key *client_host_key)
+auth_rhosts_rsa_key_allowed(struct passwd *pw, char *cuser, char *chost,
+    Key *client_host_key)
 {
-       extern ServerOptions options;
-       const char *canonical_hostname;
        HostStatus host_status;
 
-       debug("Trying rhosts with RSA host authentication for client user %.100s", client_user);
-
-       if (pw == NULL || client_host_key == NULL || client_host_key->rsa == NULL)
-               return 0;
-
        /* Check if we would accept it using rhosts authentication. */
-       if (!auth_rhosts(pw, client_user))
+       if (!auth_rhosts(pw, cuser))
                return 0;
 
-       canonical_hostname = get_canonical_hostname(
-           options.verify_reverse_mapping);
-
-       debug("Rhosts RSA authentication: canonical host %.900s", canonical_hostname);
-
        host_status = check_key_in_hostfiles(pw, client_host_key,
-           canonical_hostname, _PATH_SSH_SYSTEM_HOSTFILE,
+           chost, _PATH_SSH_SYSTEM_HOSTFILE,
            options.ignore_user_known_hosts ? NULL : _PATH_SSH_USER_HOSTFILE);
 
-       if (host_status != HOST_OK) {
+       return (host_status == HOST_OK);
+}
+
+/*
+ * Tries to authenticate the user using the .rhosts file and the host using
+ * its host key.  Returns true if authentication succeeds.
+ */
+int
+auth_rhosts_rsa(Authctxt *authctxt, 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 ||
+           client_host_key->rsa == NULL)
+               return 0;
+
+       chost = (char *)get_canonical_hostname(options.use_dns);
+       debug("Rhosts RSA authentication: canonical host %.900s", chost);
+
+       if (!PRIVSEP(auth_rhosts_rsa_key_allowed(pw, cuser, chost, client_host_key))) {
                debug("Rhosts with RSA host authentication denied: unknown or invalid host key");
                packet_send_debug("Your host key cannot be verified: unknown or invalid host key.");
                return 0;
@@ -63,9 +75,9 @@ auth_rhosts_rsa(struct passwd *pw, const char *client_user, Key *client_host_key
        /* A matching host key was found and is known. */
 
        /* Perform the challenge-response dialog with the client for the host key. */
-       if (!auth_rsa_challenge_dialog(client_host_key->rsa)) {
-               log("Client on %.800s failed to respond correctly to host authentication.",
-                   canonical_hostname);
+       if (!auth_rsa_challenge_dialog(client_host_key)) {
+               logit("Client on %.800s failed to respond correctly to host authentication.",
+                   chost);
                return 0;
        }
        /*
@@ -74,7 +86,7 @@ auth_rhosts_rsa(struct passwd *pw, const char *client_user, Key *client_host_key
         */
 
        verbose("Rhosts with RSA host authentication accepted for %.100s, %.100s on %.700s.",
-          pw->pw_name, client_user, canonical_hostname);
+           pw->pw_name, cuser, chost);
        packet_send_debug("Rhosts with RSA host authentication accepted.");
        return 1;
 }