From 2db9b8c2c5e8b20ec118b892fdcde8302dac9a1f Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Sun, 3 Oct 2010 15:00:22 -0600
Subject: [PATCH] LDAP sessonhandler has been removed

---
 horde/config/conf.xml | 9 ++-------
 horde/docs/UPGRADING  | 2 ++
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index a61899298..3884ea4e3 100644
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -1257,8 +1257,8 @@
    <configheader>Custom Session Handler Settings</configheader>
    <configswitch name="type" desc="What sessionhandler driver should we
    use?">Builtin
-    <case name="Builtin" desc="Use the default PHP session handler (file-based by
-    default)">
+    <case name="Builtin" desc="Use the default PHP session handler (file-based
+    by default)">
      <configdescription>
       If you have configured a custom session extension in php.ini, such as
       native memcache sessions, then you should use this option. Horde doesn't
@@ -1276,11 +1276,6 @@
       <configstring name="gc" desc="Your gc() function"/>
      </configsection>
     </case>
-    <case name="Ldap" desc="LDAP">
-     <configsection name="params">
-      <configldap switchname="driverconfig"/>
-     </configsection>
-    </case>
     <case name="Memcache" desc="Memcache only">
      <configsection name="params">
       <configswitch name="track" required="false" desc="Keep track of active
diff --git a/horde/docs/UPGRADING b/horde/docs/UPGRADING
index d15493712..feb5c179f 100644
--- a/horde/docs/UPGRADING
+++ b/horde/docs/UPGRADING
@@ -49,6 +49,8 @@ Removed support for dBase, Frontbase, and mSQL database servers.
 
 Removed support for krb5 authentication driver.
 
+Removed LDAP session handler.
+
 Removed Mime Viewer drivers: Enscript & Webcpp. Use 'Srchighlite' instead.
 
 The registry.php file has changed ('status' => 'sidebar').
-- 
2.11.0