merge 6.2p1; reorder additions to monitor.h for easier merging in future

1 files changed, 10 insertions, 3 deletions

diff --git a/auth1.c b/auth1.c
index cc85aec74..6eea8d81e 100644
--- a/auth1.c
+++ b/auth1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth1.c,v 1.75 2010/08/31 09:58:37 djm Exp $ */
+/* $OpenBSD: auth1.c,v 1.77 2012/12/02 20:34:09 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -253,7 +253,8 @@ do_authloop(Authctxt *authctxt)
                 if (options.use_pam && (PRIVSEP(do_pam_account())))
 #endif
                 {
-                        auth_log(authctxt, 1, "without authentication", "");
+                        auth_log(authctxt, 1, 0, "without authentication",
+                            NULL, "");
                         return;
                 }
         }
@@ -352,7 +353,8 @@ do_authloop(Authctxt *authctxt)
 
  skip:
                 /* Log before sending the reply */
-                auth_log(authctxt, authenticated, get_authname(type), info);
+                auth_log(authctxt, authenticated, 0, get_authname(type),
+                    NULL, info);
 
                 if (client_user != NULL) {
                         xfree(client_user);
@@ -406,6 +408,11 @@ do_authentication(Authctxt *authctxt)
                 authctxt->pw = fakepw();
         }
 
+        /* Configuration may have changed as a result of Match */
+        if (options.num_auth_methods != 0)
+                fatal("AuthenticationMethods is not supported with SSH "
+                    "protocol 1");
+
         setproctitle("%s%s", authctxt->valid ? user : "unknown",
             use_privsep ? " [net]" : "");