From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 22 Feb 2012 05:17:27 +0000 (+0100)
Subject: allow more characters in ldap base_dn attribute
X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=commitdiff_plain;h=d9483d94065796763eecfb48ff63568a6f1e857c

allow more characters in ldap base_dn attribute
---

diff --git a/Makefile b/Makefile
index f9cebd6..37d7f09 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=1.0
 PACKAGE=libpve-access-control
-PKGREL=12
+PKGREL=13
 
 DESTDIR=
 PREFIX=/usr
diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm
index 0e625d5..e860db1 100644
--- a/PVE/AccessControl.pm
+++ b/PVE/AccessControl.pm
@@ -663,7 +663,7 @@ my $valid_attributes = {
     ldap => {
 	server1 => '[\w\d]+(.[\w\d]+)*',
 	server2 => '[\w\d]+(.[\w\d]+)*',
-	base_dn => '\w+=[\w\s]+(,\s*\w+=[\w\s]+)*',
+	base_dn => '\w+=[^,]+(,\s*\w+=[^,]+)*',
 	user_attr => '\S{2,}',
 	secure => '',
 	port => '\d+',
diff --git a/changelog.Debian b/changelog.Debian
index 3fcbce6..476a7e4 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+libpve-access-control (1.0-13) unstable; urgency=low
+
+  * allow more characters in ldap base_dn attribute
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 22 Feb 2012 06:17:02 +0100
+
 libpve-access-control (1.0-12) unstable; urgency=low
 
   * allow more characters with realm IDs