Don't check for leading/trailing spaces when loading an entitlement cert

ticket https://fedorahosted.org/freeipa/ticket/1505
>From 67e91eda119389a10161838dd446aa20b0c43eae Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcrit...@redhat.com>
Date: Thu, 21 Jul 2011 11:14:10 -0400
Subject: [PATCH] Don't check for leading/trailing spaces when loading an entitlement cert

It very well may consist of extra spaces, the MIME encoder will handle
these.

https://fedorahosted.org/freeipa/ticket/1505
---
 freeipa.spec.in           |    7 +++++--
 ipalib/plugins/entitle.py |    1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/freeipa.spec.in b/freeipa.spec.in
index 5b6d993..fdb11af 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -81,7 +81,7 @@ Requires: nss-tools
 Requires: krb5-server
 Requires: krb5-server-ldap
 Requires: krb5-pkinit-openssl
-Requires: cyrus-sasl-gssapi
+Requires: cyrus-sasl-gssapi%{?_isa}
 Requires: ntp
 Requires: httpd
 Requires: mod_wsgi
@@ -143,7 +143,7 @@ Summary: IPA authentication for use on clients
 Group: System Environment/Base
 Requires: %{name}-python = %{version}-%{release}
 Requires: python-ldap
-Requires: cyrus-sasl-gssapi
+Requires: cyrus-sasl-gssapi%{?_isa}
 Requires: ntp
 Requires: krb5-workstation
 Requires: authconfig
@@ -514,6 +514,9 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf
 
 %changelog
+* Wed Jul 20 2011 Rob Crittenden <rcrit...@redhat.com> - 2.0.90-7
+- Make cyrus-sasl-gssapi requires arch-specific
+
 * Thu Jul 14 2011 Rob Crittenden <rcrit...@redhat.com> - 2.0.90-6
 - Add ipa-csreplica-manage tool.
 
diff --git a/ipalib/plugins/entitle.py b/ipalib/plugins/entitle.py
index 1c1b708..1c945fe 100644
--- a/ipalib/plugins/entitle.py
+++ b/ipalib/plugins/entitle.py
@@ -596,6 +596,7 @@ class entitle_import(LDAPUpdate):
     takes_args = (
         File('usercertificate*', validate_certificate,
             cli_name='certificate_file',
+            noextrawhitespace=False,
         ),
     )
 
-- 
1.7.4

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to