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.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.c')
-rw-r--r-- | monitor.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor.c,v 1.112 2011/05/20 03:25:45 djm Exp $ */ | 1 | /* $OpenBSD: monitor.c,v 1.113 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> |
@@ -632,6 +632,7 @@ mm_answer_pwnamallow(int sock, Buffer *m) | |||
632 | char *username; | 632 | char *username; |
633 | struct passwd *pwent; | 633 | struct passwd *pwent; |
634 | int allowed = 0; | 634 | int allowed = 0; |
635 | u_int i; | ||
635 | 636 | ||
636 | debug3("%s", __func__); | 637 | debug3("%s", __func__); |
637 | 638 | ||
@@ -676,9 +677,14 @@ mm_answer_pwnamallow(int sock, Buffer *m) | |||
676 | if (options.x != NULL) \ | 677 | if (options.x != NULL) \ |
677 | buffer_put_cstring(m, options.x); \ | 678 | buffer_put_cstring(m, options.x); \ |
678 | } while (0) | 679 | } while (0) |
680 | #define M_CP_STRARRAYOPT(x, nx) do { \ | ||
681 | for (i = 0; i < options.nx; i++) \ | ||
682 | buffer_put_cstring(m, options.x[i]); \ | ||
683 | } while (0) | ||
679 | /* See comment in servconf.h */ | 684 | /* See comment in servconf.h */ |
680 | COPY_MATCH_STRING_OPTS(); | 685 | COPY_MATCH_STRING_OPTS(); |
681 | #undef M_CP_STROPT | 686 | #undef M_CP_STROPT |
687 | #undef M_CP_STRARRAYOPT | ||
682 | 688 | ||
683 | debug3("%s: sending MONITOR_ANS_PWNAM: %d", __func__, allowed); | 689 | debug3("%s: sending MONITOR_ANS_PWNAM: %d", __func__, allowed); |
684 | mm_request_send(sock, MONITOR_ANS_PWNAM, m); | 690 | mm_request_send(sock, MONITOR_ANS_PWNAM, m); |
@@ -691,7 +697,6 @@ mm_answer_pwnamallow(int sock, Buffer *m) | |||
691 | monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1); | 697 | monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1); |
692 | monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1); | 698 | monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1); |
693 | } | 699 | } |
694 | |||
695 | #ifdef USE_PAM | 700 | #ifdef USE_PAM |
696 | if (options.use_pam) | 701 | if (options.use_pam) |
697 | monitor_permit(mon_dispatch, MONITOR_REQ_PAM_START, 1); | 702 | monitor_permit(mon_dispatch, MONITOR_REQ_PAM_START, 1); |