summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/auth.c
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2015-01-20 23:14:00 +0000
committerderaadt <deraadt@openbsd.org>2015-01-20 23:14:00 +0000
commitace78debd18ce723905dd08f8e9e5976c31613bc (patch)
tree091cdb66a4aa1d8d8326da076b2e62c3c1dc5c72 /usr.bin/ssh/auth.c
parentuse SUBDIR to recuse into unit tests; makes "make obj" actually (diff)
downloadwireguard-openbsd-ace78debd18ce723905dd08f8e9e5976c31613bc.tar.xz
wireguard-openbsd-ace78debd18ce723905dd08f8e9e5976c31613bc.zip
Reduce use of <sys/param.h> and transition to <limits.h> throughout.
ok djm markus
Diffstat (limited to 'usr.bin/ssh/auth.c')
-rw-r--r--usr.bin/ssh/auth.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/auth.c b/usr.bin/ssh/auth.c
index e27944d0929..a5695301678 100644
--- a/usr.bin/ssh/auth.c
+++ b/usr.bin/ssh/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.
*
@@ -25,7 +25,6 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <errno.h>
#include <fcntl.h>
@@ -37,6 +36,7 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
+#include <limits.h>
#include "xmalloc.h"
#include "match.h"
@@ -285,7 +285,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,
@@ -377,7 +377,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;