upstream commit

Reduce use of <sys/param.h> and transition to <limits.h>
 throughout. ok djm markus

1 files changed, 4 insertions, 4 deletions

diff --git a/auth.c b/auth.c
index b259c6ef1..facc962b2 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.108 2014/12/21 22:27:56 djm Exp $ */
+/* $OpenBSD: auth.c,v 1.109 2015/01/20 23:14:00 deraadt Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -27,7 +27,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 
 #include <netinet/in.h>
 
@@ -50,6 +49,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <limits.h>
 
 #include "xmalloc.h"
 #include "match.h"
@@ -376,7 +376,7 @@ auth_root_allowed(const char *method)
 char *
 expand_authorized_keys(const char *filename, struct passwd *pw)
 {
-        char *file, ret[MAXPATHLEN];
+        char *file, ret[PATH_MAX];
         int i;
 
         file = percent_expand(filename, "h", pw->pw_dir,
@@ -468,7 +468,7 @@ int
 auth_secure_path(const char *name, struct stat *stp, const char *pw_dir,
     uid_t uid, char *err, size_t errlen)
 {
-        char buf[MAXPATHLEN], homedir[MAXPATHLEN];
+        char buf[PATH_MAX], homedir[PATH_MAX];
         char *cp;
         int comparehome = 0;
         struct stat st;