diff options
author | Damien Miller <djm@mindrot.org> | 2010-10-07 21:40:17 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-10-07 21:40:17 +1100 |
commit | c54b02c4eb82ed71449109774eecf5935bdc61bf (patch) | |
tree | f3165df1d5bcbe7ab9af3ded418c65cecab3e4c7 | |
parent | 68e2e56ea90d88f514672991a2ac11445df0e4ac (diff) |
- djm@cvs.openbsd.org 2010/09/30 11:04:51
[servconf.c]
prevent free() of string in .rodata when overriding AuthorizedKeys in
a Match block; patch from rein AT basefarm.no
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | servconf.c | 8 |
2 files changed, 8 insertions, 4 deletions
@@ -18,6 +18,10 @@ | |||
18 | when performing an "ls" in columnated (short) mode, only call | 18 | when performing an "ls" in columnated (short) mode, only call |
19 | ioctl(TIOCGWINSZ) once to get the window width instead of per- | 19 | ioctl(TIOCGWINSZ) once to get the window width instead of per- |
20 | filename | 20 | filename |
21 | - djm@cvs.openbsd.org 2010/09/30 11:04:51 | ||
22 | [servconf.c] | ||
23 | prevent free() of string in .rodata when overriding AuthorizedKeys in | ||
24 | a Match block; patch from rein AT basefarm.no | ||
21 | 25 | ||
22 | 20100924 | 26 | 20100924 |
23 | - (djm) OpenBSD CVS Sync | 27 | - (djm) OpenBSD CVS Sync |
diff --git a/servconf.c b/servconf.c index d26a7db05..41c9c6964 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.c,v 1.211 2010/09/22 05:01:29 djm Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.212 2010/09/30 11:04:51 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -259,12 +259,12 @@ fill_default_server_options(ServerOptions *options) | |||
259 | if (options->authorized_keys_file2 == NULL) { | 259 | if (options->authorized_keys_file2 == NULL) { |
260 | /* authorized_keys_file2 falls back to authorized_keys_file */ | 260 | /* authorized_keys_file2 falls back to authorized_keys_file */ |
261 | if (options->authorized_keys_file != NULL) | 261 | if (options->authorized_keys_file != NULL) |
262 | options->authorized_keys_file2 = options->authorized_keys_file; | 262 | options->authorized_keys_file2 = xstrdup(options->authorized_keys_file); |
263 | else | 263 | else |
264 | options->authorized_keys_file2 = _PATH_SSH_USER_PERMITTED_KEYS2; | 264 | options->authorized_keys_file2 = xstrdup(_PATH_SSH_USER_PERMITTED_KEYS2); |
265 | } | 265 | } |
266 | if (options->authorized_keys_file == NULL) | 266 | if (options->authorized_keys_file == NULL) |
267 | options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS; | 267 | options->authorized_keys_file = xstrdup(_PATH_SSH_USER_PERMITTED_KEYS); |
268 | if (options->permit_tun == -1) | 268 | if (options->permit_tun == -1) |
269 | options->permit_tun = SSH_TUNMODE_NO; | 269 | options->permit_tun = SSH_TUNMODE_NO; |
270 | if (options->zero_knowledge_password_authentication == -1) | 270 | if (options->zero_knowledge_password_authentication == -1) |