diff options
author | Colin Watson <cjwatson@debian.org> | 2015-08-19 14:23:50 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-08-19 14:23:50 +0100 |
commit | baccdb349b31c47cd76fb63211f754ed33a9707e (patch) | |
tree | d03653f975fd4eb8bf71bb0c9d168614401202fa /misc.c | |
parent | 487bdb3a5ef6075887b830ccb8a0b14f6da78e93 (diff) | |
parent | 9f82e5a9042f2d872e98f48a876fcab3e25dd9bb (diff) |
Import openssh_6.8p1.orig.tar.gz
Diffstat (limited to 'misc.c')
-rw-r--r-- | misc.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.c,v 1.94 2014/07/15 15:54:14 millert Exp $ */ | 1 | /* $OpenBSD: misc.c,v 1.96 2015/01/16 06:40:12 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. |
@@ -30,8 +30,8 @@ | |||
30 | #include <sys/ioctl.h> | 30 | #include <sys/ioctl.h> |
31 | #include <sys/socket.h> | 31 | #include <sys/socket.h> |
32 | #include <sys/un.h> | 32 | #include <sys/un.h> |
33 | #include <sys/param.h> | ||
34 | 33 | ||
34 | #include <limits.h> | ||
35 | #include <stdarg.h> | 35 | #include <stdarg.h> |
36 | #include <stdio.h> | 36 | #include <stdio.h> |
37 | #include <stdlib.h> | 37 | #include <stdlib.h> |
@@ -551,7 +551,7 @@ tilde_expand_filename(const char *filename, uid_t uid) | |||
551 | if (path != NULL) | 551 | if (path != NULL) |
552 | filename = path + 1; | 552 | filename = path + 1; |
553 | 553 | ||
554 | if (xasprintf(&ret, "%s%s%s", pw->pw_dir, sep, filename) >= MAXPATHLEN) | 554 | if (xasprintf(&ret, "%s%s%s", pw->pw_dir, sep, filename) >= PATH_MAX) |
555 | fatal("tilde_expand_filename: Path too long"); | 555 | fatal("tilde_expand_filename: Path too long"); |
556 | 556 | ||
557 | return (ret); | 557 | return (ret); |