Testing landing of bug 359716 again to see if we've fixed the bustages. It may stay if we have. r=benjamin (build config),sr=mscott

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_5_17_client_branch
+LDAPCSDK_CO_TAG      = LDAPCSDK_6_0_3_CLIENT_BRANCH
 LOCALES_CO_TAG       =
 
 #######################################################################

configure.in

@@ -7543,14 +7543,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 -lnsldap32v50 -lnsldappr32v50'
+            LDAP_LIBS='-L$(DIST)/lib -lnsldap32v60 -lnsldappr32v60 -lnsldif32v60'
         else
-            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v50.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v50.${IMPORT_LIB_SUFFIX}'
+            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}'
         fi
     elif test "$VACPP"; then
-            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap50.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap50.${IMPORT_LIB_SUFFIX}'
+            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}'
     else
-        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap50 -llber50 -lprldap50'
+        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60'
     fi
 fi
 

xpinstall/packager/os2/browser.jst

@@ -157,6 +157,8 @@ function upgradeCleanup()
   deleteThisFile("Components", "xpinstall.xpt");
   deleteThisFile("Components", "xuldoc.xpt");
   deleteThisFile("Components", "xultmpl.xpt");
+  deleteThisFile("Program", "ldap50.dll");
+  deleteThisFile("Program", "prldap50.dll");
 }
 
 // main

xpinstall/packager/packages-os2

@@ -315,10 +315,11 @@ bin/components/spellchecker.xpt
 ; LDAP components need to be in the browser for AutoConfig
 bin/components/mozldap.dll
 bin/components/mozldap.xpt
-;bin/nsldap32v50.dll
-bin/ldap50.dll
-;bin/nsldappr32v50.dll
-bin/prldap50.dll
+;bin/nsldap32v60.dll
+bin/ldap60.dll
+;bin/nsldappr32v60.dll
+bin/prldap60.dll
+bin/ldif60.dll
 
 ; p3p
 bin/components/p3p.xpt

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/libldap50.so
-bin/libprldap50.so
-bin/liblber50.so
+bin/libldap60.so
+bin/libprldap60.so
+bin/libldif60.so
 bin/components/libmozldap.so
 bin/components/mozldap.xpt
 

xpinstall/packager/packages-win

@@ -193,8 +193,9 @@ bin\components\spellchecker.xpt
 ; LDAP components need to be in the browser for AutoConfig
 bin\components\mozldap.dll
 bin\components\mozldap.xpt
-bin\nsldap32v50.dll
-bin\nsldappr32v50.dll
+bin\nsldap32v60.dll
+bin\nsldappr32v60.dll
+bin\nsldif32v60.dll
 
 ;PSM related files
 bin\components\pippki.dll

xpinstall/packager/unix/browser.jst

@@ -49,6 +49,9 @@ function upgradeCleanup()
   deleteThisFile("Program",    "libcmt.so");
   deleteThisFile("Program",    "libjpeg.so");
   deleteThisFile("Program",    "libprotocol.so");
+  deleteThisFile("Program",    "libldap50.so");
+  deleteThisFile("Program",    "libprldap50.so");
+  deleteThisFile("Program",    "liblber50.so");
 }
 
 var srDest = $SpaceRequired$;

xpinstall/packager/windows/browser.jst

@@ -389,6 +389,8 @@ function upgradeCleanup()
   deleteThisFile("Program",    "gkwidget.dll");
   deleteThisFile("Program",    "jpeg3250.dll");
   deleteThisFile("Program",    "mozreg.dll");
+  deleteThisFile("Program",    "nsldap32v50.dll");
+  deleteThisFile("Program",    "nsldappr32v50.dll");
   deleteThisFile("Program",    "ISimpleDOMNodeMarshal.dll");
   deleteThisFile("Program",    "ISimpleDOMDocumentMarshal.dll");
   deleteThisFile("Program",    "defaults/pref/config.js");