From 12014a2c269715aae8bfdd646be9a7e43d9726c1 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 21 Jan 2016 15:48:16 +0100
Subject: [adauth/ldapauth] Prevent non-string value (false) from being used as
 certificate

---
 inc/configmodule/adauth.inc.php   | 3 +++
 inc/configmodule/ldapauth.inc.php | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'inc')

diff --git a/inc/configmodule/adauth.inc.php b/inc/configmodule/adauth.inc.php
index 360194f1..a8f5e88a 100644
--- a/inc/configmodule/adauth.inc.php
+++ b/inc/configmodule/adauth.inc.php
@@ -30,6 +30,9 @@ class ConfigModule_AdAuth extends ConfigModule
 		$config['proxyport'] = 3100 + $this->id();
 		$config['filename'] = $tgz;
 		$config['moduleid'] = $this->id();
+		if (isset($config['certificate']) && !is_string($config['certificate'])) {
+			unset($config['certificate']);
+		}
 		return Taskmanager::submit('CreateLdapConfig', $config);
 	}
 
diff --git a/inc/configmodule/ldapauth.inc.php b/inc/configmodule/ldapauth.inc.php
index da9cd6fc..d334a2f5 100644
--- a/inc/configmodule/ldapauth.inc.php
+++ b/inc/configmodule/ldapauth.inc.php
@@ -31,6 +31,9 @@ class ConfigModule_LdapAuth extends ConfigModule
 		$config['filename'] = $tgz;
 		$config['moduleid'] = $this->id();
 		$config['plainldap'] = true;
+		if (isset($config['certificate']) && !is_string($config['certificate'])) {
+			unset($config['certificate']);
+		}
 		return Taskmanager::submit('CreateLdapConfig', $config);
 	}
 
-- 
cgit v1.2.3-55-g7522