summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Gerard DeRose <jderose@redhat.com>2010-02-11 02:27:00 -0700
committerJason Gerard DeRose <jderose@redhat.com>2010-02-12 01:22:02 -0700
commit85bb506d5b471aa6bdbf96be7c95bad244640595 (patch)
tree7a07615dad39a93fcbfda562298bb20b6f0e3843
parenteadca473a935a7b8b73185c4a4a540f510064fec (diff)
downloadfreeipa-85bb506d5b471aa6bdbf96be7c95bad244640595.tar.gz
freeipa-85bb506d5b471aa6bdbf96be7c95bad244640595.tar.xz
freeipa-85bb506d5b471aa6bdbf96be7c95bad244640595.zip
Add fix for wehjit (ctypes) SELinux problem
-rw-r--r--ipa.spec.in9
-rw-r--r--ipawebui/__init__.py7
2 files changed, 13 insertions, 3 deletions
diff --git a/ipa.spec.in b/ipa.spec.in
index 3de1a2a7..0607dd76 100644
--- a/ipa.spec.in
+++ b/ipa.spec.in
@@ -85,7 +85,7 @@ Requires: mod_nss
Requires: python-ldap
Requires: python-krbV
Requires: python-assets
-Requires: python-wehjit >= 0.2.0
+Requires: python-wehjit >= 0.2.2
Requires: acl
Requires: python-pyasn1 >= 0.0.9a
Requires: libcap
@@ -497,6 +497,9 @@ fi
%endif
%changelog
+* Thu Feb 11 2010 Jason Gerard DeRose <jderose@redhat.com> - 1.99-16
+- Require python-wehjit >= 0.2.2
+
* Wed Feb 3 2010 Rob Crittenden <rcritten@redhat.com> - 1.99-15
- Add sssd and certmonger as a Requires on ipa-client
@@ -655,7 +658,7 @@ fi
* Thu Jan 24 2008 Rob Crittenden <rcritten@redhat.com> 0.99-3
- Included LICENSE and README in all packages for documentation
-- Move user-modifiable content to /etc/ipa and linked back to
+- Move user-modifiable content to /etc/ipa and linked back to
/usr/share/ipa/html
- Changed some references to /usr to the {_usr} macro and /etc
to {_sysconfdir}
@@ -702,7 +705,7 @@ fi
- Convert to autotools-based build
* Tue Sep 25 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-2
-
+
* Fri Sep 7 2007 Karl MacMillan <kmacmill@redhat.com> - 0.3.0-1
- Added support for libipa-dna-plugin
diff --git a/ipawebui/__init__.py b/ipawebui/__init__.py
index c7ebaa87..037fc764 100644
--- a/ipawebui/__init__.py
+++ b/ipawebui/__init__.py
@@ -20,6 +20,13 @@
IPA web UI.
"""
+# Special wehjit initialization to prevent it from loading the plugins that
+# require pygments, which uses ctypes, which makes the httpd SELinux policy
+# crazy:
+import wehjit
+wehjit.builtins._skip_pygments = True
+wehjit.init_builtins()
+
from ipalib.backend import Executioner
from ipalib.request import destroy_context
from ipaserver.rpcserver import extract_query