Rob Crittenden wrote:
Don't check for leading/trailing spaces when loading an entitlement cert

ticket https://fedorahosted.org/freeipa/ticket/1505

With API.txt update, doesn't affect wire protocol.
>From cc125874a54e4db66136817eb2a92f15be90d344 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
---
 API.txt                   |    2 +-
 freeipa.spec.in           |    7 +++++--
 ipalib/plugins/entitle.py |    1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/API.txt b/API.txt
index 0ceb3a7..863adb0 100644
--- a/API.txt
+++ b/API.txt
@@ -874,7 +874,7 @@ output: Output('count', <type 'int'>, 'Number of entries returned')
 output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
 command: entitle_import
 args: 1,3,1
-arg: File('usercertificate*', validate_certificate, cli_name='certificate_file')
+arg: File('usercertificate*', validate_certificate, cli_name='certificate_file', noextrawhitespace=False)
 option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
 option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
 option: Str('uuid?', autofill=True, default=u'IMPORTED', flags=['no_create', 'no_update'], label=Gettext('UUID', domain='ipa', localedir=None))
diff --git a/freeipa.spec.in b/freeipa.spec.in
index f476a2c..6ba1536 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
@@ -511,6 +511,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