src/usr.bin/ssh/auth-rh-rsa.c - diff

Return to auth-rh-rsa.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/Attic/auth-rh-rsa.c between version 1.2 and 1.3

-version 1.2, 1999/10/03 21:50:03
+version 1.3, 1999/11/09 23:09:58
 Line 53
 Line 53
 Line 53
    host_status = check_host_in_hostfile(SSH_SYSTEM_HOSTFILE, canonical_hostname,
                                         client_host_key_bits, client_host_key_e,
                                         client_host_key_n, ke, kn);
+   /* Check user host file. */
+   if (host_status != HOST_OK) {
+     struct stat st;
+     char *user_hostfile = tilde_expand_filename(SSH_USER_HOSTFILE, pw->pw_uid);
+     /* Check file permissions of SSH_USER_HOSTFILE,
+        auth_rsa() did already check pw->pw_dir, but there is a race XXX */
+     if (strict_modes &&
+         (stat(user_hostfile, &st) == 0) &&
+         ((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
+         (st.st_mode & 022) != 0)) {
+        log("Rhosts RSA authentication refused for %.100s: bad owner or modes for %.200s",
+            pw->pw_name, user_hostfile);
+     } else {
+       /* XXX race between stat and the following open() */
+       temporarily_use_uid(pw->pw_uid);
+       host_status = check_host_in_hostfile(user_hostfile, canonical_hostname,
+                                            client_host_key_bits, client_host_key_e,
+                                            client_host_key_n, ke, kn);
+       restore_uid();
+     }
+     xfree(user_hostfile);
+   }
    BN_free(ke);
    BN_free(kn);
    if (host_status != HOST_OK) {
      /* The host key was not found. */
      debug("Rhosts with RSA host authentication denied: unknown or invalid host key");