New upstream release (6.8p1).

1 files changed, 9 insertions, 9 deletions

diff --git a/auth2.c b/auth2.c
index fa1a5886d..6eb3cc7b9 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.132 2014/07/15 15:54:14 millert Exp $ */
+/* $OpenBSD: auth2.c,v 1.135 2015/01/19 20:07:45 markus Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -89,8 +89,8 @@ Authmethod *authmethods[] = {
 
 /* protocol */
 
-static void input_service_request(int, u_int32_t, void *);
-static void input_userauth_request(int, u_int32_t, void *);
+static int input_service_request(int, u_int32_t, void *);
+static int input_userauth_request(int, u_int32_t, void *);
 
 /* helper */
 static Authmethod *authmethod_lookup(Authctxt *, const char *);
@@ -153,9 +153,7 @@ userauth_banner(void)
 {
         char *banner = NULL;
 
-        if (options.banner == NULL ||
-            strcasecmp(options.banner, "none") == 0 ||
-            (datafellows & SSH_BUG_BANNER) != 0)
+        if (options.banner == NULL || (datafellows & SSH_BUG_BANNER) != 0)
                 return;
 
         if ((banner = PRIVSEP(auth2_read_banner())) == NULL)
@@ -178,7 +176,7 @@ do_authentication2(Authctxt *authctxt)
 }
 
 /*ARGSUSED*/
-static void
+static int
 input_service_request(int type, u_int32_t seq, void *ctxt)
 {
         Authctxt *authctxt = ctxt;
@@ -209,10 +207,11 @@ input_service_request(int type, u_int32_t seq, void *ctxt)
                 packet_disconnect("bad service request %s", service);
         }
         free(service);
+        return 0;
 }
 
 /*ARGSUSED*/
-static void
+static int
 input_userauth_request(int type, u_int32_t seq, void *ctxt)
 {
         Authctxt *authctxt = ctxt;
@@ -294,6 +293,7 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
         free(service);
         free(user);
         free(method);
+        return 0;
 }
 
 void
@@ -364,7 +364,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, const char *method,
         } else {
 
                 /* Allow initial try of "none" auth without failure penalty */
-                if (!authctxt->server_caused_failure &&
+                if (!partial && !authctxt->server_caused_failure &&
                     (authctxt->attempt > 1 || strcmp(method, "none") != 0))
                         authctxt->failures++;
                 if (authctxt->failures >= options.max_authtries) {