abbra pushed to freeipa (master). "Fix typo in the patch to fix trusts"

[notifications at fedoraproject.org]

From 54c544a18d2e1ba039facfd0dbf6e64f28c75b5e Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy at redhat.com>
Date: Tue, 12 May 2015 15:42:09 +0300
Subject: Fix typo in the patch to fix trusts


diff --git a/0006-ipaserver-dcerpc-Ensure-LSA-pipe-has-session-key-bef.patch b/0006-ipaserver-dcerpc-Ensure-LSA-pipe-has-session-key-bef.patch
index 8d48a15..f31c6da 100644
--- a/0006-ipaserver-dcerpc-Ensure-LSA-pipe-has-session-key-bef.patch
+++ b/0006-ipaserver-dcerpc-Ensure-LSA-pipe-has-session-key-bef.patch
@@ -1,7 +1,7 @@
-From 35ab765554e3469daae204fb045eb4281f4f4f36 Mon Sep 17 00:00:00 2001
+From 28fccac07760764acc86f9c91850481ef2c1e1ae Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy at redhat.com>
 Date: Fri, 8 May 2015 12:09:13 +0000
-Subject: [PATCH] ipaserver/dcerpc: Ensure LSA pipe has session key before
+Subject: [PATCH 2/3] ipaserver/dcerpc: Ensure LSA pipe has session key before
  using it
 
 With Samba 4.2 there is a bug that prevents Samba to consider Kerberos
@@ -23,7 +23,7 @@ Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1219834
  1 file changed, 14 insertions(+), 5 deletions(-)
 
 diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
-index e342c49..25f8bf8 100644
+index e342c49..44689cc 100644
 --- a/ipaserver/dcerpc.py
 +++ b/ipaserver/dcerpc.py
 @@ -89,6 +89,10 @@ dcerpc_error_codes = {
@@ -56,7 +56,7 @@ index e342c49..25f8bf8 100644
 +                session_attempts = session_attempts + 1
  
 -        if self._pipe is None and attempts == len(bindings):
-+        if self._pipe is None and (attempts + session_attemps) == len(bindings):
++        if self._pipe is None and (attempts + session_attempts) == len(bindings):
              raise errors.ACIError(
                  info=_('CIFS server %(host)s denied your credentials') % dict(host=remote_host))
  
diff --git a/freeipa.spec b/freeipa.spec
index 9b90156..70ec946 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -27,7 +27,7 @@
 
 Name:           freeipa
 Version:        %{VERSION}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -950,6 +950,9 @@ fi
 %endif # ONLY_CLIENT
 
 %changelog
+* Tue May 12 2015 Alexander Bokovoy <abokovoy at redhat.com> - 4.1.4-4
+- Fix typo in the patch to fix bug #1219834
+
 * Mon May 11 2015 Alexander Bokovoy <abokovoy at redhat.com> - 4.1.4-3
 - Fix FreeIPA trusts to AD feature with Samba 4.2 (#1219834)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/freeipa.git/commit/?h=master&id=54c544a18d2e1ba039facfd0dbf6e64f28c75b5e