[openssh/f20] don't consider a partial success as a failure

[Petr Lautrbach]

commit 2ab54181063801ed611f87faeb160d6f52bd0e62
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Thu Sep 4 16:33:25 2014 +0200

    don't consider a partial success as a failure

 openssh-6.4p1-partial-success.patch |   16 ++++++++++++++++
 openssh.spec                        |    4 ++++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/openssh-6.4p1-partial-success.patch b/openssh-6.4p1-partial-success.patch
new file mode 100644
index 0000000..f16794f
--- /dev/null
+++ b/openssh-6.4p1-partial-success.patch
@@ -0,0 +1,16 @@
+diff --git a/auth2.c b/auth2.c
+index 06b672c..8cb9a97 100644
+--- a/auth2.c
++++ b/auth2.c
+@@ -377,8 +377,9 @@ userauth_finish(Authctxt *authctxt, int authenticated, const char *method,
+ 		authctxt->success = 1;
+ 	} else {
+ 
+-		/* Allow initial try of "none" auth without failure penalty */
+-		if (!authctxt->server_caused_failure &&
++		/* Allow initial try of "none" auth without failure penalty
++		 * Partial succes is not failure */
++		if (!authctxt->server_caused_failure && !partial &&
+ 		    (authctxt->attempt > 1 || strcmp(method, "none") != 0))
+ 			authctxt->failures++;
+ 		if (authctxt->failures >= options.max_authtries) {
diff --git a/openssh.spec b/openssh.spec
index c6697f2..92f88f2 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -204,6 +204,9 @@ Patch911: openssh-6.4p1-set_remote_ipaddr.patch
 # https://bugzilla.mindrot.org/show_bug.cgi?id=2058
 # slightly changed patch from comment 10
 Patch912: openssh-6.4p1-utf8-banner.patch
+# don't consider a partial success as a failure
+# https://bugzilla.mindrot.org/show_bug.cgi?id=2270
+Patch913: openssh-6.4p1-partial-success.patch
 
 License: BSD
 Group: Applications/Internet
@@ -434,6 +437,7 @@ popd
 %patch910 -p1 -b .NI_MAXHOST
 %patch911 -p1 -b .set_remote_ipaddr
 %patch912 -p1 -b .utf8-banner
+%patch913 -p1 -b .partial-success