From 4d45b2a34187da47dda3a037998aaadcbfcd677b Mon Sep 17 00:00:00 2001
From: "bugzilla%standard8.demon.co.uk" <bugzilla%standard8.demon.co.uk>
Date: Fri, 30 Mar 2007 19:00:43 +0000
Subject: [PATCH] Back out ldap-csdk upgrade from bug 359716 now that data has
 been gathered so the remaining problems can be fixed correctly.

---
 client.mk                              | 2 +-
 configure.in                           | 8 ++++----
 mail/installer/windows/packages-static | 5 ++---
 xpinstall/packager/packages-os2        | 9 ++++-----
 xpinstall/packager/packages-unix       | 6 +++---
 xpinstall/packager/packages-win        | 5 ++---
 6 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/client.mk b/client.mk
index 3e488791bfb..1997b602605 100644
--- a/client.mk
+++ b/client.mk
@@ -407,7 +407,7 @@ MODULES_all :=                                  \
 #MOZ_CO_TAG          = <tag>
 NSPR_CO_TAG          = NSPRPUB_PRE_4_2_CLIENT_BRANCH
 NSS_CO_TAG           = NSS_3_11_5_RTM
-LDAPCSDK_CO_TAG      =
+LDAPCSDK_CO_TAG      = ldapcsdk_5_17_client_branch
 LOCALES_CO_TAG       =
 
 #######################################################################
diff --git a/configure.in b/configure.in
index 98879830dd6..b69b11bcf6f 100644
--- a/configure.in
+++ b/configure.in
@@ -7597,14 +7597,14 @@ if test "$MOZ_LDAP_XPCOM"; then
     LDAP_CFLAGS='-I${DIST}/public/ldap'
     if test "$OS_ARCH" = "WINNT"; then
         if test -n "$GNU_CC"; then
-            LDAP_LIBS='-L$(DIST)/lib -lnsldap32v60 -lnsldappr32v60 -lnsldif32v60'
+            LDAP_LIBS='-L$(DIST)/lib -lnsldap32v50 -lnsldappr32v50'
         else
-            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldif32v60.${IMPORT_LIB_SUFFIX}'
+            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v50.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v50.${IMPORT_LIB_SUFFIX}'
         fi
     elif test "$VACPP"; then
-            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)ldif60.${IMPORT_LIB_SUFFIX}'
+            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap50.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap50.${IMPORT_LIB_SUFFIX}'
     else
-        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60'
+        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap50 -llber50 -lprldap50'
     fi
 fi
 
diff --git a/mail/installer/windows/packages-static b/mail/installer/windows/packages-static
index 051aba3a653..24f48e4e8c9 100644
--- a/mail/installer/windows/packages-static
+++ b/mail/installer/windows/packages-static
@@ -148,9 +148,8 @@ bin\greprefs\*
 bin\components\mozldap.xpt
 bin\components\nsLDAPPrefsService.js
 bin\components\nsAbLDAPAttributeMap.js
-bin\nsldap32v60.dll
-bin\nsldappr32v60.dll
-bin\nsldif32v60.dll
+bin\nsldap32v50.dll
+bin\nsldappr32v50.dll
 
 ; wallet
 bin\components\wallet.xpt 
diff --git a/xpinstall/packager/packages-os2 b/xpinstall/packager/packages-os2
index 564a3974e0d..924786afb46 100644
--- a/xpinstall/packager/packages-os2
+++ b/xpinstall/packager/packages-os2
@@ -315,11 +315,10 @@ bin/components/spellchecker.xpt
 ; LDAP components need to be in the browser for AutoConfig
 bin/components/mozldap.dll
 bin/components/mozldap.xpt
-;bin/nsldap32v60.dll
-bin/ldap60.dll
-;bin/nsldappr32v60.dll
-bin/prldap60.dll
-bin/ldif60.dll
+;bin/nsldap32v50.dll
+bin/ldap50.dll
+;bin/nsldappr32v50.dll
+bin/prldap50.dll
 
 ; p3p
 bin/components/p3p.xpt
diff --git a/xpinstall/packager/packages-unix b/xpinstall/packager/packages-unix
index a1fd6589b80..0e6c9ce8ecc 100644
--- a/xpinstall/packager/packages-unix
+++ b/xpinstall/packager/packages-unix
@@ -313,9 +313,9 @@ bin/components/libwebsrvcs.so
 bin/components/websrvcs.xpt
 
 ; LDAP components need to be in the browser for AutoConfig
-bin/libldap60.so
-bin/libprldap60.so
-bin/libldif60.so
+bin/libldap50.so
+bin/libprldap50.so
+bin/liblber50.so
 bin/components/libmozldap.so
 bin/components/mozldap.xpt
 
diff --git a/xpinstall/packager/packages-win b/xpinstall/packager/packages-win
index 098263b6f81..40ead5c6f9d 100644
--- a/xpinstall/packager/packages-win
+++ b/xpinstall/packager/packages-win
@@ -193,9 +193,8 @@ bin\components\spellchecker.xpt
 ; LDAP components need to be in the browser for AutoConfig
 bin\components\mozldap.dll
 bin\components\mozldap.xpt
-bin\nsldap32v60.dll
-bin\nsldappr32v60.dll
-bin\nsldif32v60.dll
+bin\nsldap32v50.dll
+bin\nsldappr32v50.dll
 
 ;PSM related files
 bin\components\pippki.dll