From 981c0859ffdef308087e8399762f19088006eb92 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 11 Feb 2016 18:06:03 +0100
Subject: [ad/ldap] Fallback to default ports if working on old config

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

(limited to 'inc')

diff --git a/inc/configmodule/adauth.inc.php b/inc/configmodule/adauth.inc.php
index a8f5e88a..daca3fb0 100644
--- a/inc/configmodule/adauth.inc.php
+++ b/inc/configmodule/adauth.inc.php
@@ -20,9 +20,18 @@ class ConfigModule_AdAuth extends ConfigModule
 	{
 		Trigger::ldadp($this->id(), $parent);
 		$config = $this->moduleData;
+		if (isset($config['certificate']) && !is_string($config['certificate'])) {
+			unset($config['certificate']);
+		}
 		if (preg_match('/^([^\:]+)\:(\d+)$/', $config['server'], $out)) {
 			$config['server'] = $out[1];
 			$config['adport'] = $out[2];
+		} else {
+			if (isset($config['certificate'])) {
+				$config['adport'] = 636;
+			} else {
+				$config['adport'] = 389;
+			}
 		}
 		$config['parentTask'] = $parent;
 		$config['failOnParentFail'] = false;
@@ -30,9 +39,6 @@ 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 d334a2f5..67b1997a 100644
--- a/inc/configmodule/ldapauth.inc.php
+++ b/inc/configmodule/ldapauth.inc.php
@@ -20,9 +20,18 @@ class ConfigModule_LdapAuth extends ConfigModule
 	{
 		Trigger::ldadp($this->id(), $parent);
 		$config = $this->moduleData;
+		if (isset($config['certificate']) && !is_string($config['certificate'])) {
+			unset($config['certificate']);
+		}
 		if (preg_match('/^([^\:]+)\:(\d+)$/', $config['server'], $out)) {
 			$config['server'] = $out[1];
 			$config['adport'] = $out[2]; // sic!
+		} else {
+			if (isset($config['certificate'])) {
+				$config['adport'] = 636;
+			} else {
+				$config['adport'] = 389;
+			}
 		}
 		$config['parentTask'] = $parent;
 		$config['failOnParentFail'] = false;
@@ -31,9 +40,6 @@ 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