From 9b7e20f50f3b35b6413d695808d87904255622df Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sun, 19 Oct 2014 20:47:13 +0200
Subject: Relax regexp for extracting domain from windows logon

---
 modules/sysconfig/addmodule_ad.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/sysconfig')

diff --git a/modules/sysconfig/addmodule_ad.inc.php b/modules/sysconfig/addmodule_ad.inc.php
index e188a54b..3afe3972 100644
--- a/modules/sysconfig/addmodule_ad.inc.php
+++ b/modules/sysconfig/addmodule_ad.inc.php
@@ -105,8 +105,8 @@ class AdModule_Finish extends AddModule_Base
 		$binddn = Request::post('binddn');
 		$searchbase = Request::post('searchbase');
 		if (empty($searchbase)) {
-			$originalBindDn = Request::post('originalbinddn');
-			if (!preg_match('#^(\w+)[/\\\\]\w+$#', $originalBindDn, $out)) {
+			$originalBindDn = str_replace('\\', '/', trim(Request::post('originalbinddn')));
+			if (!preg_match('#^([^/]+)/[^/]+$#', $originalBindDn, $out)) {
 				Message::addError('value-invalid', 'binddn', $originalBindDn);
 				Util::redirect('?do=SysConfig&action=addmodule&step=AdModule_Start');
 			}
-- 
cgit v1.2.3-55-g7522