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@

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 @@
-/* $OpenBSD: monitor_wrap.c,v 1.71 2011/05/20 03:25:45 djm Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.72 2011/05/23 03:30:07 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -211,7 +211,7 @@ mm_getpwnamallow(const char *username)
 {
         Buffer m;
         struct passwd *pw;
-        u_int len;
+        u_int len, i;
         ServerOptions *newopts;
 
         debug3("%s entering", __func__);
@@ -250,9 +250,14 @@ out:
                 if (newopts->x != NULL) \
                         newopts->x = buffer_get_string(&m, NULL); \
         } while (0)
+#define M_CP_STRARRAYOPT(x, nx) do { \
+                for (i = 0; i < newopts->nx; i++) \
+                        newopts->x[i] = buffer_get_string(&m, NULL); \
+        } while (0)
         /* See comment in servconf.h */
         COPY_MATCH_STRING_OPTS();
 #undef M_CP_STROPT
+#undef M_CP_STRARRAYOPT
 
         copy_set_server_options(&options, newopts, 1);
         xfree(newopts);