Browse Source

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

pull/24/head
Matt A. Tobin 3 years ago committed by Roy Tam
parent
commit
deb86ab699
  1. 0
      ldap/c-sdk/common.mozbuild
  2. 0
      ldap/c-sdk/liblber/bprint.c
  3. 0
      ldap/c-sdk/liblber/decode.c
  4. 0
      ldap/c-sdk/liblber/dtest.c
  5. 0
      ldap/c-sdk/liblber/encode.c
  6. 0
      ldap/c-sdk/liblber/etest.c
  7. 0
      ldap/c-sdk/liblber/idtest.c
  8. 0
      ldap/c-sdk/liblber/io.c
  9. 0
      ldap/c-sdk/liblber/lber-int.h
  10. 4
      ldap/c-sdk/liblber/moz.build
  11. 0
      ldap/c-sdk/libldap/abandon.c
  12. 0
      ldap/c-sdk/libldap/add.c
  13. 0
      ldap/c-sdk/libldap/authzidctrl.c
  14. 0
      ldap/c-sdk/libldap/bind.c
  15. 0
      ldap/c-sdk/libldap/cache.c
  16. 0
      ldap/c-sdk/libldap/charray.c
  17. 0
      ldap/c-sdk/libldap/charset.c
  18. 0
      ldap/c-sdk/libldap/cldap.c
  19. 0
      ldap/c-sdk/libldap/compare.c
  20. 0
      ldap/c-sdk/libldap/compat.c
  21. 0
      ldap/c-sdk/libldap/control.c
  22. 0
      ldap/c-sdk/libldap/countvalues.c
  23. 0
      ldap/c-sdk/libldap/delete.c
  24. 0
      ldap/c-sdk/libldap/disptmpl.c
  25. 0
      ldap/c-sdk/libldap/dllmain.c
  26. 0
      ldap/c-sdk/libldap/dsparse.c
  27. 0
      ldap/c-sdk/libldap/error.c
  28. 0
      ldap/c-sdk/libldap/extendop.c
  29. 0
      ldap/c-sdk/libldap/free.c
  30. 0
      ldap/c-sdk/libldap/freevalues.c
  31. 0
      ldap/c-sdk/libldap/friendly.c
  32. 0
      ldap/c-sdk/libldap/getattr.c
  33. 0
      ldap/c-sdk/libldap/getdn.c
  34. 0
      ldap/c-sdk/libldap/getdxbyname.c
  35. 0
      ldap/c-sdk/libldap/geteffectiverightsctrl.c
  36. 0
      ldap/c-sdk/libldap/getentry.c
  37. 0
      ldap/c-sdk/libldap/getfilter.c
  38. 0
      ldap/c-sdk/libldap/getoption.c
  39. 0
      ldap/c-sdk/libldap/getvalues.c
  40. 0
      ldap/c-sdk/libldap/ldap-int.h
  41. 0
      ldap/c-sdk/libldap/libldap.def
  42. 0
      ldap/c-sdk/libldap/memcache.c
  43. 0
      ldap/c-sdk/libldap/message.c
  44. 0
      ldap/c-sdk/libldap/modify.c
  45. 4
      ldap/c-sdk/libldap/moz.build
  46. 0
      ldap/c-sdk/libldap/mozock.c
  47. 0
      ldap/c-sdk/libldap/nsprthreadtest.c
  48. 0
      ldap/c-sdk/libldap/open.c
  49. 0
      ldap/c-sdk/libldap/os-ip.c
  50. 0
      ldap/c-sdk/libldap/proxyauthctrl.c
  51. 0
      ldap/c-sdk/libldap/psearch.c
  52. 0
      ldap/c-sdk/libldap/pthreadtest.c
  53. 0
      ldap/c-sdk/libldap/pwmodext.c
  54. 0
      ldap/c-sdk/libldap/pwpctrl.c
  55. 0
      ldap/c-sdk/libldap/referral.c
  56. 0
      ldap/c-sdk/libldap/regex.c
  57. 0
      ldap/c-sdk/libldap/rename.c
  58. 0
      ldap/c-sdk/libldap/request.c
  59. 0
      ldap/c-sdk/libldap/reslist.c
  60. 0
      ldap/c-sdk/libldap/result.c
  61. 0
      ldap/c-sdk/libldap/saslbind.c
  62. 0
      ldap/c-sdk/libldap/saslio.c
  63. 0
      ldap/c-sdk/libldap/sbind.c
  64. 0
      ldap/c-sdk/libldap/search.c
  65. 0
      ldap/c-sdk/libldap/setoption.c
  66. 0
      ldap/c-sdk/libldap/sort.c
  67. 0
      ldap/c-sdk/libldap/sortctrl.c
  68. 0
      ldap/c-sdk/libldap/srchpref.c
  69. 0
      ldap/c-sdk/libldap/test.c
  70. 0
      ldap/c-sdk/libldap/tmplout.c
  71. 0
      ldap/c-sdk/libldap/tmpltest.c
  72. 0
      ldap/c-sdk/libldap/ufn.c
  73. 0
      ldap/c-sdk/libldap/unbind.c
  74. 0
      ldap/c-sdk/libldap/unescape.c
  75. 0
      ldap/c-sdk/libldap/url.c
  76. 0
      ldap/c-sdk/libldap/userstatusctrl.c
  77. 0
      ldap/c-sdk/libldap/utf8.c
  78. 0
      ldap/c-sdk/libldap/vlistctrl.c
  79. 0
      ldap/c-sdk/libldap/whoami.c
  80. 0
      ldap/c-sdk/libldif/libldif.def
  81. 0
      ldap/c-sdk/libldif/line64.c
  82. 4
      ldap/c-sdk/libldif/moz.build
  83. 0
      ldap/c-sdk/libprldap/ldappr-dns.c
  84. 0
      ldap/c-sdk/libprldap/ldappr-error.c
  85. 0
      ldap/c-sdk/libprldap/ldappr-int.h
  86. 0
      ldap/c-sdk/libprldap/ldappr-io.c
  87. 0
      ldap/c-sdk/libprldap/ldappr-public.c
  88. 0
      ldap/c-sdk/libprldap/ldappr-threads.c
  89. 0
      ldap/c-sdk/libprldap/libprldap.def
  90. 4
      ldap/c-sdk/libprldap/moz.build
  91. 8
      ldap/c-sdk/moz.build
  92. 11
      ldap/moz.build
  93. 2
      ldap/xpcom/src/moz.build
  94. 25
      ldap/xpcom/src/nsLDAPURL.cpp

0
ldap/ldap-sdk.mozbuild → ldap/c-sdk/common.mozbuild

0
ldap/c-sdk/libraries/liblber/bprint.c → ldap/c-sdk/liblber/bprint.c

0
ldap/c-sdk/libraries/liblber/decode.c → ldap/c-sdk/liblber/decode.c

0
ldap/c-sdk/libraries/liblber/dtest.c → ldap/c-sdk/liblber/dtest.c

0
ldap/c-sdk/libraries/liblber/encode.c → ldap/c-sdk/liblber/encode.c

0
ldap/c-sdk/libraries/liblber/etest.c → ldap/c-sdk/liblber/etest.c

0
ldap/c-sdk/libraries/liblber/idtest.c → ldap/c-sdk/liblber/idtest.c

0
ldap/c-sdk/libraries/liblber/io.c → ldap/c-sdk/liblber/io.c

0
ldap/c-sdk/libraries/liblber/lber-int.h → ldap/c-sdk/liblber/lber-int.h

4
ldap/c-sdk/libraries/liblber/moz.build → 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'
]

0
ldap/c-sdk/libraries/libldap/abandon.c → ldap/c-sdk/libldap/abandon.c

0
ldap/c-sdk/libraries/libldap/add.c → ldap/c-sdk/libldap/add.c

0
ldap/c-sdk/libraries/libldap/authzidctrl.c → ldap/c-sdk/libldap/authzidctrl.c

0
ldap/c-sdk/libraries/libldap/bind.c → ldap/c-sdk/libldap/bind.c

0
ldap/c-sdk/libraries/libldap/cache.c → ldap/c-sdk/libldap/cache.c

0
ldap/c-sdk/libraries/libldap/charray.c → ldap/c-sdk/libldap/charray.c

0
ldap/c-sdk/libraries/libldap/charset.c → ldap/c-sdk/libldap/charset.c

0
ldap/c-sdk/libraries/libldap/cldap.c → ldap/c-sdk/libldap/cldap.c

0
ldap/c-sdk/libraries/libldap/compare.c → ldap/c-sdk/libldap/compare.c

0
ldap/c-sdk/libraries/libldap/compat.c → ldap/c-sdk/libldap/compat.c

0
ldap/c-sdk/libraries/libldap/control.c → ldap/c-sdk/libldap/control.c

0
ldap/c-sdk/libraries/libldap/countvalues.c → ldap/c-sdk/libldap/countvalues.c

0
ldap/c-sdk/libraries/libldap/delete.c → ldap/c-sdk/libldap/delete.c

0
ldap/c-sdk/libraries/libldap/disptmpl.c → ldap/c-sdk/libldap/disptmpl.c

0
ldap/c-sdk/libraries/libldap/dllmain.c → ldap/c-sdk/libldap/dllmain.c

0
ldap/c-sdk/libraries/libldap/dsparse.c → ldap/c-sdk/libldap/dsparse.c

0
ldap/c-sdk/libraries/libldap/error.c → ldap/c-sdk/libldap/error.c

0
ldap/c-sdk/libraries/libldap/extendop.c → ldap/c-sdk/libldap/extendop.c

0
ldap/c-sdk/libraries/libldap/free.c → ldap/c-sdk/libldap/free.c

0
ldap/c-sdk/libraries/libldap/freevalues.c → ldap/c-sdk/libldap/freevalues.c

0
ldap/c-sdk/libraries/libldap/friendly.c → ldap/c-sdk/libldap/friendly.c

0
ldap/c-sdk/libraries/libldap/getattr.c → ldap/c-sdk/libldap/getattr.c

0
ldap/c-sdk/libraries/libldap/getdn.c → ldap/c-sdk/libldap/getdn.c

0
ldap/c-sdk/libraries/libldap/getdxbyname.c → ldap/c-sdk/libldap/getdxbyname.c

0
ldap/c-sdk/libraries/libldap/geteffectiverightsctrl.c → ldap/c-sdk/libldap/geteffectiverightsctrl.c

0
ldap/c-sdk/libraries/libldap/getentry.c → ldap/c-sdk/libldap/getentry.c

0
ldap/c-sdk/libraries/libldap/getfilter.c → ldap/c-sdk/libldap/getfilter.c

0
ldap/c-sdk/libraries/libldap/getoption.c → ldap/c-sdk/libldap/getoption.c

0
ldap/c-sdk/libraries/libldap/getvalues.c → ldap/c-sdk/libldap/getvalues.c

0
ldap/c-sdk/libraries/libldap/ldap-int.h → ldap/c-sdk/libldap/ldap-int.h

0
ldap/c-sdk/libraries/libldap/libldap.def → ldap/c-sdk/libldap/libldap.def

0
ldap/c-sdk/libraries/libldap/memcache.c → ldap/c-sdk/libldap/memcache.c

0
ldap/c-sdk/libraries/libldap/message.c → ldap/c-sdk/libldap/message.c

0
ldap/c-sdk/libraries/libldap/modify.c → ldap/c-sdk/libldap/modify.c

4
ldap/c-sdk/libraries/libldap/moz.build → 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']

0
ldap/c-sdk/libraries/libldap/mozock.c → ldap/c-sdk/libldap/mozock.c

0
ldap/c-sdk/libraries/libldap/nsprthreadtest.c → ldap/c-sdk/libldap/nsprthreadtest.c

0
ldap/c-sdk/libraries/libldap/open.c → ldap/c-sdk/libldap/open.c

0
ldap/c-sdk/libraries/libldap/os-ip.c → ldap/c-sdk/libldap/os-ip.c

0
ldap/c-sdk/libraries/libldap/proxyauthctrl.c → ldap/c-sdk/libldap/proxyauthctrl.c

0
ldap/c-sdk/libraries/libldap/psearch.c → ldap/c-sdk/libldap/psearch.c

0
ldap/c-sdk/libraries/libldap/pthreadtest.c → ldap/c-sdk/libldap/pthreadtest.c

0
ldap/c-sdk/libraries/libldap/pwmodext.c → ldap/c-sdk/libldap/pwmodext.c

0
ldap/c-sdk/libraries/libldap/pwpctrl.c → ldap/c-sdk/libldap/pwpctrl.c

0
ldap/c-sdk/libraries/libldap/referral.c → ldap/c-sdk/libldap/referral.c

0
ldap/c-sdk/libraries/libldap/regex.c → ldap/c-sdk/libldap/regex.c

0
ldap/c-sdk/libraries/libldap/rename.c → ldap/c-sdk/libldap/rename.c

0
ldap/c-sdk/libraries/libldap/request.c → ldap/c-sdk/libldap/request.c

0
ldap/c-sdk/libraries/libldap/reslist.c → ldap/c-sdk/libldap/reslist.c

0
ldap/c-sdk/libraries/libldap/result.c → ldap/c-sdk/libldap/result.c

0
ldap/c-sdk/libraries/libldap/saslbind.c → ldap/c-sdk/libldap/saslbind.c

0
ldap/c-sdk/libraries/libldap/saslio.c → ldap/c-sdk/libldap/saslio.c

0
ldap/c-sdk/libraries/libldap/sbind.c → ldap/c-sdk/libldap/sbind.c

0
ldap/c-sdk/libraries/libldap/search.c → ldap/c-sdk/libldap/search.c

0
ldap/c-sdk/libraries/libldap/setoption.c → ldap/c-sdk/libldap/setoption.c

0
ldap/c-sdk/libraries/libldap/sort.c → ldap/c-sdk/libldap/sort.c

0
ldap/c-sdk/libraries/libldap/sortctrl.c → ldap/c-sdk/libldap/sortctrl.c

0
ldap/c-sdk/libraries/libldap/srchpref.c → ldap/c-sdk/libldap/srchpref.c

0
ldap/c-sdk/libraries/libldap/test.c → ldap/c-sdk/libldap/test.c

0
ldap/c-sdk/libraries/libldap/tmplout.c → ldap/c-sdk/libldap/tmplout.c

0
ldap/c-sdk/libraries/libldap/tmpltest.c → ldap/c-sdk/libldap/tmpltest.c

0
ldap/c-sdk/libraries/libldap/ufn.c → ldap/c-sdk/libldap/ufn.c

0
ldap/c-sdk/libraries/libldap/unbind.c → ldap/c-sdk/libldap/unbind.c

0
ldap/c-sdk/libraries/libldap/unescape.c → ldap/c-sdk/libldap/unescape.c

0
ldap/c-sdk/libraries/libldap/url.c → ldap/c-sdk/libldap/url.c

0
ldap/c-sdk/libraries/libldap/userstatusctrl.c → ldap/c-sdk/libldap/userstatusctrl.c

0
ldap/c-sdk/libraries/libldap/utf8.c → ldap/c-sdk/libldap/utf8.c

0
ldap/c-sdk/libraries/libldap/vlistctrl.c → ldap/c-sdk/libldap/vlistctrl.c

0
ldap/c-sdk/libraries/libldap/whoami.c → ldap/c-sdk/libldap/whoami.c

0
ldap/c-sdk/libraries/libldif/libldif.def → ldap/c-sdk/libldif/libldif.def

0
ldap/c-sdk/libraries/libldif/line64.c → ldap/c-sdk/libldif/line64.c

4
ldap/c-sdk/libraries/libldif/moz.build → 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':

0
ldap/c-sdk/libraries/libprldap/ldappr-dns.c → ldap/c-sdk/libprldap/ldappr-dns.c

0
ldap/c-sdk/libraries/libprldap/ldappr-error.c → ldap/c-sdk/libprldap/ldappr-error.c

0
ldap/c-sdk/libraries/libprldap/ldappr-int.h → ldap/c-sdk/libprldap/ldappr-int.h

0
ldap/c-sdk/libraries/libprldap/ldappr-io.c → ldap/c-sdk/libprldap/ldappr-io.c

0
ldap/c-sdk/libraries/libprldap/ldappr-public.c → ldap/c-sdk/libprldap/ldappr-public.c

0
ldap/c-sdk/libraries/libprldap/ldappr-threads.c → ldap/c-sdk/libprldap/ldappr-threads.c

0
ldap/c-sdk/libraries/libprldap/libprldap.def → ldap/c-sdk/libprldap/libprldap.def

4
ldap/c-sdk/libraries/libprldap/moz.build → 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 += [

8
ldap/c-sdk/libraries/moz.build → 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',
]

11
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'
]

2
ldap/xpcom/src/moz.build

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

25
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);
}
Loading…
Cancel
Save