Issue #1258 - Part 2: Use binoc-central version of ldap

ldap/c-sdk/liblber/moz.build

@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('/ldap/ldap-sdk.mozbuild')
+include('../common.mozbuild')
 
 Library('lber60')
 
@@ -18,6 +18,6 @@ DEFINES['USE_WAITPID'] = True
 DEFINES['NEEDPROTOS'] = True
 
 LOCAL_INCLUDES += [
-    '/ldap/c-sdk/include'
+    '../include'
 ]
 

ldap/c-sdk/libldap/moz.build

@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('/ldap/ldap-sdk.mozbuild')
+include('../common.mozbuild')
 
 SharedLibrary('ldap60')
 
@@ -82,7 +82,7 @@ if CONFIG['OS_TARGET'] != 'WINNT':
 DEFINES['NEEDPROTOS'] = True
 
 LOCAL_INCLUDES += [
-    '/ldap/c-sdk/include'
+    '../include'
 ]
 
 USE_LIBS += ['lber60']

ldap/c-sdk/libldif/moz.build

@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('/ldap/ldap-sdk.mozbuild')
+include('../common.mozbuild')
 
 SharedLibrary('ldif60')
 
@@ -12,7 +12,7 @@ SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '/ldap/c-sdk/include'
+    '../include'
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':

ldap/c-sdk/libprldap/moz.build

@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('/ldap/ldap-sdk.mozbuild')
+include('../common.mozbuild')
 
 SharedLibrary('prldap60')
 
@@ -22,7 +22,7 @@ DEFINES['USE_WAITPID'] = True
 DEFINES['NEEDPROTOS'] = True
 
 LOCAL_INCLUDES += [
-    '/ldap/c-sdk/include'
+    '../include'
 ]
 
 USE_LIBS += [

ldap/c-sdk/moz.build

@@ -3,9 +3,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
+Library('ldapsdks')
+
 DIRS += [
     'liblber',
     'libldif',
     'libldap',
     'libprldap'
 ]
+
+USE_LIBS += [
+    'ldap60',
+    'ldif60',
+    'prldap60',
+]

ldap/moz.build

@@ -3,14 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-Library('ldapsdks')
-
 DIRS += [
-    'c-sdk/libraries'
-]
-
-USE_LIBS += [
-    'ldap60',
-    'ldif60',
-    'prldap60',
+    'c-sdk',
+    'xpcom'
 ]

ldap/xpcom/src/moz.build

@@ -48,6 +48,6 @@ else:
     FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/ldap/c-sdk/include',
+    '../../c-sdk/include',
 ]
 

ldap/xpcom/src/nsLDAPURL.cpp

@@ -723,3 +723,28 @@ nsLDAPURL::GetHasRef(bool *result)
 {
   return mBaseURL->GetHasRef(result);
 }
+
+
+NS_IMETHODIMP
+nsLDAPURL::GetFilePath(nsACString &aFilePath)
+{
+  return mBaseURL->GetFilePath(aFilePath);
+}
+
+NS_IMETHODIMP
+nsLDAPURL::SetFilePath(const nsACString &aFilePath)
+{
+  return mBaseURL->SetFilePath(aFilePath);
+}
+
+NS_IMETHODIMP
+nsLDAPURL::GetQuery(nsACString &aQuery)
+{
+  return mBaseURL->GetQuery(aQuery);
+}
+
+NS_IMETHODIMP
+nsLDAPURL::SetQuery(const nsACString &aQuery)
+{
+  return mBaseURL->SetQuery(aQuery);
+}