allow more characters in ldap base_dn attribute

diff --git a/Makefile b/Makefile
index f9cebd680cae7a8ec44a5905d19696059744980b..37d7f094c40bb2e1d96ae4936b21101d7f98b65e 100644 (file)
--- 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 0e625d5e178cde7624f5cef275e13f79689e91d2..e860db1e1a41a156bb83e9eea46319aaf4fb111d 100644 (file)
--- 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 3fcbce651238aae32597f465a8e73aed4a01508f..476a7e4009bd9efb85cd9494ad05f393a95b86ce 100644 (file)
--- 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