src/usr.bin/ssh/servconf.c - diff

Return to servconf.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.201, 2010/01/10 03:51:17

version 1.202, 2010/01/13 03:48:12

Line 422

return sBadOption;

}

char *

derelativise_path(const char *path)

{

char *expanded, *ret, *cwd;

expanded = tilde_expand_filename(path, getuid());

if (*expanded == '/')

return expanded;

if ((cwd = getcwd(NULL, 0)) == NULL)

fatal("%s: getcwd: %s", __func__, strerror(errno));

xasprintf(&ret, "%s/%s", cwd, expanded);

xfree(cwd);

xfree(expanded);

return ret;

}

static void

add_listen_addr(ServerOptions *options, char *addr, int port)

{

Line 750

Line 766

fatal("%s line %d: missing file name.",

filename, linenum);

if (*activep && *charptr == NULL) {

*charptr = tilde_expand_filename(arg, getuid());

*charptr = derelativise_path(arg);

/* increase optional counter */

if (intptr != NULL)

*intptr = *intptr + 1;