Move the bundled Net/LDAP2 library to the LdapCommon directory

11 files changed, 3 insertions, 0 deletions

diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php
index e2ca569f3..ee436d824 100644
--- a/plugins/LdapCommon/LdapCommon.php
+++ b/plugins/LdapCommon/LdapCommon.php
@@ -31,6 +31,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
+// We bundle the Net/LDAP2 library...
+set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib');
+
 class LdapCommon
 {
     protected static $ldap_connections = array();
diff --git a/extlib/Net/LDAP2.php b/plugins/LdapCommon/extlib/Net/LDAP2.php
index 26f5e7560..26f5e7560 100644
--- a/extlib/Net/LDAP2.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2.php
diff --git a/extlib/Net/LDAP2/Entry.php b/plugins/LdapCommon/extlib/Net/LDAP2/Entry.php
index 66de96678..66de96678 100644
--- a/extlib/Net/LDAP2/Entry.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/Entry.php
diff --git a/extlib/Net/LDAP2/Filter.php b/plugins/LdapCommon/extlib/Net/LDAP2/Filter.php
index 0723edab2..0723edab2 100644
--- a/extlib/Net/LDAP2/Filter.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/Filter.php
diff --git a/extlib/Net/LDAP2/LDIF.php b/plugins/LdapCommon/extlib/Net/LDAP2/LDIF.php
index 34f3e75dd..34f3e75dd 100644
--- a/extlib/Net/LDAP2/LDIF.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/LDIF.php
diff --git a/extlib/Net/LDAP2/RootDSE.php b/plugins/LdapCommon/extlib/Net/LDAP2/RootDSE.php
index 8dc81fd4f..8dc81fd4f 100644
--- a/extlib/Net/LDAP2/RootDSE.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/RootDSE.php
diff --git a/extlib/Net/LDAP2/Schema.php b/plugins/LdapCommon/extlib/Net/LDAP2/Schema.php
index b590eabc5..b590eabc5 100644
--- a/extlib/Net/LDAP2/Schema.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/Schema.php
diff --git a/extlib/Net/LDAP2/SchemaCache.interface.php b/plugins/LdapCommon/extlib/Net/LDAP2/SchemaCache.interface.php
index e0c3094c4..e0c3094c4 100644
--- a/extlib/Net/LDAP2/SchemaCache.interface.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/SchemaCache.interface.php
diff --git a/extlib/Net/LDAP2/Search.php b/plugins/LdapCommon/extlib/Net/LDAP2/Search.php
index de4fde122..de4fde122 100644
--- a/extlib/Net/LDAP2/Search.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/Search.php
diff --git a/extlib/Net/LDAP2/SimpleFileSchemaCache.php b/plugins/LdapCommon/extlib/Net/LDAP2/SimpleFileSchemaCache.php
index 8019654ac..8019654ac 100644
--- a/extlib/Net/LDAP2/SimpleFileSchemaCache.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/SimpleFileSchemaCache.php
diff --git a/extlib/Net/LDAP2/Util.php b/plugins/LdapCommon/extlib/Net/LDAP2/Util.php
index 48b03f9f9..48b03f9f9 100644
--- a/extlib/Net/LDAP2/Util.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/Util.php