3 files changed, 16 insertions, 5 deletions

diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index cb59ccd57..1ff7114ef 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -70,8 +70,16 @@ void *reallocarray(void *, size_t, size_t);
 #endif
 
 #if !defined(HAVE_REALPATH) || defined(BROKEN_REALPATH)
+/*
+ * glibc's FORTIFY_SOURCE can redefine this and prevent us picking up the
+ * compat version.
+ */
+# ifdef BROKEN_REALPATH
+#  define realpath(x, y) _ssh_compat_realpath(x, y)
+# endif
+
 char *realpath(const char *path, char *resolved);
-#endif 
+#endif
 
 #ifndef HAVE_RRESVPORT_AF
 int rresvport_af(int *alport, sa_family_t af);
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index 4637a7a3e..f36999d7a 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -278,7 +278,7 @@ oom_adjust_setup(void)
                                         verbose("error writing %s: %s",
                                            oom_adj_path, strerror(errno));
                                 else
-                                        verbose("Set %s from %d to %d",
+                                        debug("Set %s from %d to %d",
                                            oom_adj_path, oom_adj_save, value);
                         }
                         fclose(fp);
@@ -302,7 +302,7 @@ oom_adjust_restore(void)
         if (fprintf(fp, "%d\n", oom_adj_save) <= 0)
                 verbose("error writing %s: %s", oom_adj_path, strerror(errno));
         else
-                verbose("Set %s to %d", oom_adj_path, oom_adj_save);
+                debug("Set %s to %d", oom_adj_path, oom_adj_save);
 
         fclose(fp);
         return;
diff --git a/openbsd-compat/realpath.c b/openbsd-compat/realpath.c
index b6120d034..ba4cea938 100644
--- a/openbsd-compat/realpath.c
+++ b/openbsd-compat/realpath.c
@@ -33,11 +33,13 @@
 
 #if !defined(HAVE_REALPATH) || defined(BROKEN_REALPATH)
 
+#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 
 #include <errno.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -90,7 +92,7 @@ realpath(const char *path, char resolved[PATH_MAX])
                  */
                 p = strchr(left, '/');
                 s = p ? p : left + left_len;
-                if (s - left >= sizeof(next_token)) {
+                if (s - left >= (ptrdiff_t)sizeof(next_token)) {
                         errno = ENAMETOOLONG;
                         return (NULL);
                 }
@@ -169,7 +171,8 @@ realpath(const char *path, char resolved[PATH_MAX])
                          */
                         if (p != NULL) {
                                 if (symlink[slen - 1] != '/') {
-                                        if (slen + 1 >= sizeof(symlink)) {
+                                        if (slen + 1 >=
+                                            (ptrdiff_t)sizeof(symlink)) {
                                                 errno = ENAMETOOLONG;
                                                 return (NULL);
                                         }