summaryrefslogtreecommitdiffstats
path: root/openbsd-compat
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2015-10-13 23:27:51 +0200
committerDamien Miller <djm@mindrot.org>2015-10-13 23:27:51 +0200
commit23fa695bb735f54f04d46123662609edb6c76767 (patch)
tree12291ad90350a1797da254d3b3bfb853f8a9756d /openbsd-compat
parentupstream commit (diff)
downloadopenssh-23fa695bb735f54f04d46123662609edb6c76767.tar.xz
openssh-23fa695bb735f54f04d46123662609edb6c76767.zip
upstream commit
revision 1.19 date: 2015/01/16 16:48:51; author: deraadt; state: Exp; lines: +3 -3; commitid: 0DYulI8hhujBHMcR; Move to the <limits.h> universe. review by millert, binary checking process with doug, concept with guenther
Diffstat (limited to 'openbsd-compat')
-rw-r--r--openbsd-compat/realpath.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/openbsd-compat/realpath.c b/openbsd-compat/realpath.c
index e4729a808..a6ac09ba5 100644
--- a/openbsd-compat/realpath.c
+++ b/openbsd-compat/realpath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: realpath.c,v 1.18 2014/10/19 03:56:28 doug Exp $ */
+/* $OpenBSD: realpath.c,v 1.19 2015/01/16 16:48:51 deraadt Exp $ */
/*
* Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru>
*
@@ -42,6 +42,7 @@
#include <stddef.h>
#include <string.h>
#include <unistd.h>
+#include <limits.h>
/* A slightly modified copy of this file exists in libexec/ld.so */
@@ -164,7 +165,7 @@ realpath(const char *path, char *resolved)
goto err;
}
if (S_ISLNK(sb.st_mode)) {
- if (symlinks++ > MAXSYMLINKS) {
+ if (symlinks++ > SYMLOOP_MAX) {
errno = ELOOP;
goto err;
}