tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2010/03/25 23:38:28 

[servconf.c]
     from portable: getcwd(NULL, 0) doesn't work on all platforms, so
     use a stack buffer; ok dtucker@
This commit is contained in:
Damien Miller 2010-03-26 10:40:04 +11:00
parent a83d90fbab
commit 44451d0af8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -3,6 +3,11 @@
for arc4random_buf() and arc4random_uniform(); from Josh Gilkerson for arc4random_buf() and arc4random_uniform(); from Josh Gilkerson
- (dtucker) [configure.ac] Bug #1741: Add section for Haiku, patch originally - (dtucker) [configure.ac] Bug #1741: Add section for Haiku, patch originally
by Ingo Weinhold via Scott McCreary, ok djm@ by Ingo Weinhold via Scott McCreary, ok djm@
- (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2010/03/25 23:38:28
[servconf.c]
from portable: getcwd(NULL, 0) doesn't work on all platforms, so
use a stack buffer; ok dtucker@
20100324 20100324
- (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory

7
servconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: servconf.c,v 1.206 2010/03/12 11:37:40 markus Exp $ */ /* $OpenBSD: servconf.c,v 1.207 2010/03/25 23:38:28 djm Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -470,15 +470,14 @@ parse_token(const char *cp, const char *filename,
char * char *
derelativise_path(const char *path) derelativise_path(const char *path)
{ {
char *expanded, *ret, *cwd; char *expanded, *ret, cwd[MAXPATHLEN];
expanded = tilde_expand_filename(path, getuid()); expanded = tilde_expand_filename(path, getuid());
if (*expanded == '/') if (*expanded == '/')
return expanded; return expanded;
if ((cwd = getcwd(NULL, 0)) == NULL) if (getcwd(cwd, sizeof(cwd)) == NULL)
fatal("%s: getcwd: %s", __func__, strerror(errno)); fatal("%s: getcwd: %s", __func__, strerror(errno));
xasprintf(&ret, "%s/%s", cwd, expanded); xasprintf(&ret, "%s/%s", cwd, expanded);
free(cwd);
xfree(expanded); xfree(expanded);
return ret; return ret;
} }