1 files changed, 6 insertions, 1 deletions

diff --git a/auth1.c b/auth1.c
index cc85aec74..fb37fadfe 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.76 2012/11/04 11:09:15 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -406,6 +406,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]" : "");