diff options
author | Damien Miller <djm@mindrot.org> | 2011-05-29 21:39:36 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-05-29 21:39:36 +1000 |
commit | d8478b6a9b32760d47c2419279c4a73f5f88fdb6 (patch) | |
tree | b62b256606749fbb784ab7c2c7baa610c2a7dd71 /monitor_wrap.c | |
parent | acacced70b3fd520ee3f12d3f477f9fd7c2f687a (diff) |
OpenBSD CVS Sync
- djm@cvs.openbsd.org 2011/05/23 03:30:07
[auth-rsa.c auth.c auth.h auth2-pubkey.c monitor.c monitor_wrap.c pathnames.h servconf.c servconf.h sshd.8 sshd_config sshd_config.5]
allow AuthorizedKeysFile to specify multiple files, separated by spaces.
Bring back authorized_keys2 as a default search path (to avoid breaking
existing users of this file), but override this in sshd_config so it will
be no longer used on fresh installs. Maybe in 2015 we can remove it
entierly :)
feedback and ok markus@ dtucker@
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r-- | monitor_wrap.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index d3f274021..7a90b3ba3 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.c,v 1.71 2011/05/20 03:25:45 djm Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.72 2011/05/23 03:30:07 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -211,7 +211,7 @@ mm_getpwnamallow(const char *username) | |||
211 | { | 211 | { |
212 | Buffer m; | 212 | Buffer m; |
213 | struct passwd *pw; | 213 | struct passwd *pw; |
214 | u_int len; | 214 | u_int len, i; |
215 | ServerOptions *newopts; | 215 | ServerOptions *newopts; |
216 | 216 | ||
217 | debug3("%s entering", __func__); | 217 | debug3("%s entering", __func__); |
@@ -250,9 +250,14 @@ out: | |||
250 | if (newopts->x != NULL) \ | 250 | if (newopts->x != NULL) \ |
251 | newopts->x = buffer_get_string(&m, NULL); \ | 251 | newopts->x = buffer_get_string(&m, NULL); \ |
252 | } while (0) | 252 | } while (0) |
253 | #define M_CP_STRARRAYOPT(x, nx) do { \ | ||
254 | for (i = 0; i < newopts->nx; i++) \ | ||
255 | newopts->x[i] = buffer_get_string(&m, NULL); \ | ||
256 | } while (0) | ||
253 | /* See comment in servconf.h */ | 257 | /* See comment in servconf.h */ |
254 | COPY_MATCH_STRING_OPTS(); | 258 | COPY_MATCH_STRING_OPTS(); |
255 | #undef M_CP_STROPT | 259 | #undef M_CP_STROPT |
260 | #undef M_CP_STRARRAYOPT | ||
256 | 261 | ||
257 | copy_set_server_options(&options, newopts, 1); | 262 | copy_set_server_options(&options, newopts, 1); |
258 | xfree(newopts); | 263 | xfree(newopts); |