From afe393b436a66541c3007abe6a5d260c55b51e2f Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Thu, 22 Nov 2012 07:09:40 +0000
Subject: [PATCH] Mark mcrypt-module as required.
It turns out that we are now always requiring the mcrypt module, so
mark it as required.
Thanks to Onivaldo Rosa Junior for reporting this bug!
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3203 44740490-163a-0410-bde0-09ae8108e29a
---
docs/simplesamlphp-install.txt | 3 +--
modules/core/www/frontpage_config.php | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/docs/simplesamlphp-install.txt b/docs/simplesamlphp-install.txt
index 95142748b..3dcbf7d3c 100644
--- a/docs/simplesamlphp-install.txt
+++ b/docs/simplesamlphp-install.txt
@@ -35,8 +35,7 @@ Prerequisites
* Some webserver capable of executing PHP scripts.
* PHP version >= 5.2.0.
* Suppoort for the following PHP extensions:
- * Always required: `date`, `dom`, `hash`, `libxml`, `openssl`, `pcre`, `SPL`, `zlib`
- * When encrypting assertions: `mcrypt`
+ * Always required: `date`, `dom`, `hash`, `libxml`, `openssl`, `pcre`, `SPL`, `zlib`, `mcrypt`
* When authenticating against LDAP server: `ldap`
* When authenticating against RADIUS server: `radius`
* When saving session information to memcache-server: `memcache`
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index 136b4afa1..7f4eece21 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -85,7 +85,7 @@ $functionchecks = array(
'simplexml_import_dom' => array('required', 'SimpleXML'),
'dom_import_simplexml' => array('required', 'XML DOM'),
'preg_match' => array('required', 'RegEx support'),
- 'mcrypt_module_open'=> array('optional', 'MCrypt'),
+ 'mcrypt_module_open'=> array('required', 'MCrypt'),
'mysql_connect' => array('optional', 'MySQL support'),
);
if (SimpleSAML_Module::isModuleEnabled('ldap')) {
--
GitLab