New upstream release (8.1p1)

1 files changed, 5 insertions, 6 deletions

diff --git a/auth-rhosts.c b/auth-rhosts.c
index 546aa0495..587f53721 100644
--- a/auth-rhosts.c
+++ b/auth-rhosts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-rhosts.c,v 1.49 2018/07/09 21:35:50 markus Exp $ */
+/* $OpenBSD: auth-rhosts.c,v 1.51 2019/10/02 00:42:30 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -38,7 +38,6 @@
 #include "sshkey.h"
 #include "servconf.h"
 #include "canohost.h"
-#include "sshkey.h"
 #include "hostfile.h"
 #include "auth.h"
 
@@ -222,8 +221,8 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
          * are no system-wide files.
          */
         if (!rhosts_files[rhosts_file_index] &&
-            stat(_PATH_RHOSTS_EQUIV, &st) < 0 &&
-            stat(_PATH_SSH_HOSTS_EQUIV, &st) < 0) {
+            stat(_PATH_RHOSTS_EQUIV, &st) == -1 &&
+            stat(_PATH_SSH_HOSTS_EQUIV, &st) == -1) {
                 debug3("%s: no hosts access files exist", __func__);
                 return 0;
         }
@@ -253,7 +252,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
          * Check that the home directory is owned by root or the user, and is
          * not group or world writable.
          */
-        if (stat(pw->pw_dir, &st) < 0) {
+        if (stat(pw->pw_dir, &st) == -1) {
                 logit("Rhosts authentication refused for %.100s: "
                     "no home directory %.200s", pw->pw_name, pw->pw_dir);
                 auth_debug_add("Rhosts authentication refused for %.100s: "
@@ -277,7 +276,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
                 /* Check users .rhosts or .shosts. */
                 snprintf(buf, sizeof buf, "%.500s/%.100s",
                          pw->pw_dir, rhosts_files[rhosts_file_index]);
-                if (stat(buf, &st) < 0)
+                if (stat(buf, &st) == -1)
                         continue;
 
                 /*