From 6c480d4214ccae0399eba3995821676f9ffea38a Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Wed, 11 Jun 2014 16:17:10 +0200
Subject: [PATCH] [jan] Add configuration for searching user DNs in LDAP groups
 (Bug #12128).

Conflicts:
	framework/Core/package.xml
	horde/docs/CHANGES
	horde/package.xml
---
 framework/Core/lib/Horde/Config.php |  4 ++++
 horde/config/conf.xml               | 10 +++++++---
 horde/docs/CHANGES                  |  1 +
 horde/package.xml                   |  4 +++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/framework/Core/lib/Horde/Config.php b/framework/Core/lib/Horde/Config.php
index 5ceeb09050b..f8c938b2cce 100644
--- a/framework/Core/lib/Horde/Config.php
+++ b/framework/Core/lib/Horde/Config.php
@@ -668,6 +668,10 @@ protected function _parseLevel(&$conf, $children, $ctx)
                 $conf[$node->getAttribute('switchname')] = $this->_configLDAP($ctx, $node);
                 break;
 
+            case 'configldapuser':
+                $conf = array_merge($conf, $this->_configLDAPUser($ctx, $node));
+                break;
+
             case 'configphp':
                 $conf[$name] = array(
                     '_type' => 'php',
diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index df672b09c38..a44169b2b4a 100644
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -930,9 +930,13 @@
        <configstring name="gid" desc="The group search key">cn</configstring>
        <configstring name="memberuid" desc="Group membership field">
        memberUid</configstring>
-       <configboolean name="attrisdn" required="false"
-        desc="If checked, the user member attributes returned from LDAP are
-       expected to be fully qualified DNs"/>
+       <configswitch name="attrisdn" required="false" desc="Are the user member
+       attributes returned from LDAP expected to be fully qualified DNs?">false
+        <case name="false" desc="No"/>
+        <case name="true" desc="Yes">
+          <configldapuser/>
+        </case>
+       </configswitch>
        <configlist name="newgroup_objectclass" desc="What objectclasses should
        a new group be member of? These objectclasses should cover the mail and
        gidnumber attributes as well as the group search key">
diff --git a/horde/docs/CHANGES b/horde/docs/CHANGES
index 9c1f71c1598..17959e96ea2 100644
--- a/horde/docs/CHANGES
+++ b/horde/docs/CHANGES
@@ -2,6 +2,7 @@
 v5.2.0-git
 ----------
 
+[jan] Add configuration for searching user DNs in LDAP groups (Bug #12128).
 [jan] Don't try to write to read-only group backends when removing user data
       (skhorde@smail.inf.fh-bonn-rhein-sieg.de, Bug #13248).
 
diff --git a/horde/package.xml b/horde/package.xml
index 7499258f392..087b5138391 100644
--- a/horde/package.xml
+++ b/horde/package.xml
@@ -39,6 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
  <notes>
+* [jan] Add configuration for searching user DNs in LDAP groups (Bug #12128).
 * [jan] Don&apos;t try to write to read-only group backends when removing user data (skhorde@smail.inf.fh-bonn-rhein-sieg.de, Bug #13248).
  </notes>
  <contents>
@@ -1645,7 +1646,7 @@
    <package>
     <name>Horde_Core</name>
     <channel>pear.horde.org</channel>
-    <min>2.12.0alpha1</min>
+    <min>2.12.0beta4</min>
     <max>3.0.0alpha1</max>
     <exclude>3.0.0alpha1</exclude>
    </package>
@@ -3905,6 +3906,7 @@
    <date>2014-06-04</date>
    <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
    <notes>
+* [jan] Add configuration for searching user DNs in LDAP groups (Bug #12128).
 * [jan] Don&apos;t try to write to read-only group backends when removing user data (skhorde@smail.inf.fh-bonn-rhein-sieg.de, Bug #13248).
    </notes>
   </release>