Resolves: bug 366335

Description: Make libldif public - windows specific fixes Fix Description: Windows needed a nsldif32.tdf file in order to generate the nsldif32.def file using the libldif.ex file (committed in the previous commit). Also, it has been a while since the .def files were generated. The libX.ex files have had quite a few changes, and we needed to regenerate all of the .def files. Finally, this will be version 6.0.2 of the mozilla ldap c sdk.
2007-01-15 21:21:50 +00:00 · 2007-01-15 21:21:50 +00:00 · 5ce68286d3
--- a/directory/c-sdk/build.mk
+++ b/directory/c-sdk/build.mk
@ -45,7 +45,7 @@ COMPVERSIONDIR = $(DEPTH)/directory/c-sdk
 endif

 DEFAULT_VENDOR_NAME=mozilla.org
-DEFAULT_VENDOR_VERSION=601
+DEFAULT_VENDOR_VERSION=602

 ifndef VENDOR_NAME
 VENDOR_NAME	= $(DEFAULT_VENDOR_NAME)
--- a/directory/c-sdk/ldap/libraries/msdos/winsock/nsldap32.def
+++ b/directory/c-sdk/ldap/libraries/msdos/winsock/nsldap32.def
@ -35,7 +35,7 @@
 ; 
 ; ***** END LICENSE BLOCK ***** 

-LIBRARY         NSLDAP32V6
+LIBRARY         NSLDAP32V60
 DESCRIPTION     'Lightweight Directory Access Protocol Client API for 32-bit Windows'
 VERSION		6.0
 HEAPSIZE        4096
@ -190,6 +190,10 @@ EXPORTS
 	ber_sockbuf_free		@150
 	ber_get_next_buffer_ext		@151
 	ber_svecfree		@152
+	ber_get_buf_datalen		@153
+	ber_get_buf_databegin		@154
+	ber_stack_init		@155
+	ber_sockbuf_free_data		@156

 	ldap_memfree		@200
 	ldap_ber_free		@201
@ -310,11 +314,37 @@ EXPORTS
 	ldap_x_calloc		@533
 	ldap_x_realloc		@534
 	ldap_x_free		@535
+; 
 	ldap_create_proxiedauth_control		@536
+; 
+	ldap_create_geteffectiveRights_control		@537
+; 
+	ldap_find_control		@538
+; 
+	ldap_url_parse_no_defaults		@539
+; 
+	ldap_create_userstatus_control		@550
+	ldap_parse_userstatus_control		@551
+; 
+	ldap_create_passwordpolicy_control		@560
+	ldap_create_passwordpolicy_control_ext		@561
+	ldap_parse_passwordpolicy_control		@562
+	ldap_parse_passwordpolicy_control_ext		@563
+	ldap_passwordpolicy_err2txt		@564
 ; 
 	ldap_passwd		@570
 	ldap_parse_passwd		@571
 	ldap_passwd_s		@573
+; 
+	ldap_delete_result_entry		@580
+	ldap_add_result_entry		@581
+; 
+	ldap_whoami		@590
+	ldap_parse_whoami		@591
+	ldap_whoami_s		@592
+; 
+	ldap_create_authzid_control		@600
+	ldap_parse_authzid_control		@601
 ; 
 	ldap_memcache_init		@1000
 	ldap_memcache_set		@1001
--- a/directory/c-sdk/ldap/libraries/msdos/winsock/nsldappr32.def
+++ b/directory/c-sdk/ldap/libraries/msdos/winsock/nsldappr32.def
@ -35,7 +35,7 @@
 ; 
 ; ***** END LICENSE BLOCK ***** 

-LIBRARY         NSLDAPPR32V6
+LIBRARY         NSLDAPPR32V60
 DESCRIPTION     'LDAP to NSPR glue library for 32-bit Windows'
 VERSION		6.0
 HEAPSIZE        4096
@ -55,7 +55,9 @@ EXPORTS
 	prldap_get_socket_info		@2015
 	prldap_set_session_option		@2016
 	prldap_get_session_option		@2017
-	prldap_is_installed				@2018
+	prldap_is_installed		@2018
 	prldap_import_connection		@2019
+	prldap_set_default_socket_info		@2020
+	prldap_get_default_socket_info		@2021
 ; 
 ; end of generated exports list.
--- a/directory/c-sdk/ldap/libraries/msdos/winsock/nsldapssl32.def
+++ b/directory/c-sdk/ldap/libraries/msdos/winsock/nsldapssl32.def
@ -35,7 +35,7 @@
 ; 
 ; ***** END LICENSE BLOCK ***** 

-LIBRARY         NSLDAPSSL32V6
+LIBRARY         NSLDAPSSL32V60
 DESCRIPTION     'Lightweight Directory Access Protocol Client API with SSL for 32-bit Windows'
 VERSION		6.0
 HEAPSIZE        4096
@ -59,7 +59,10 @@ EXPORTS
 	ldapssl_set_strength		@460
 	ldapssl_set_option		@461
 	ldapssl_get_option		@462
-	ldap_start_tls_s			@463
+	ldap_start_tls_s		@463
+	ldapssl_shutdown		@464
+	ldapssl_import_fd		@465
+	ldapssl_reset_to_nonsecure		@466
 ;  the last Windows ordinal number that has been reserved for SSL is 469.

 ;  Windows ordinals 1100-1150 are reserved for privately/non-published
--- a/directory/c-sdk/ldap/libraries/msdos/winsock/nsldif32.def
+++ b/directory/c-sdk/ldap/libraries/msdos/winsock/nsldif32.def
@ -0,0 +1,63 @@
+;
+; ***** BEGIN LICENSE BLOCK *****
+; Version: MPL 1.1/GPL 2.0/LGPL 2.1
+; 
+; The contents of this file are subject to the Mozilla Public License Version 
+; 1.1 (the "License"); you may not use this file except in compliance with 
+; the License. You may obtain a copy of the License at 
+; http://www.mozilla.org/MPL/
+; 
+; Software distributed under the License is distributed on an "AS IS" basis,
+; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+; for the specific language governing rights and limitations under the
+; License.
+; 
+; The Original Code is Mozilla Communicator client code.
+; 
+; The Initial Developer of the Original Code is
+; Netscape Communications Corporation.
+; Portions created by the Initial Developer are Copyright (C) 1996-1999
+; the Initial Developer. All Rights Reserved.
+; 
+; Contributor(s):
+; 
+; Alternatively, the contents of this file may be used under the terms of
+; either of the GNU General Public License Version 2 or later (the "GPL"),
+; or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+; in which case the provisions of the GPL or the LGPL are applicable instead
+; of those above. If you wish to allow use of your version of this file only
+; under the terms of either the GPL or the LGPL, and not to allow others to
+; use your version of this file under the terms of the MPL, indicate your
+; decision by deleting the provisions above and replace them with the notice
+; and other provisions required by the GPL or the LGPL. If you do not delete
+; the provisions above, a recipient may use your version of this file under
+; the terms of any one of the MPL, the GPL or the LGPL.
+; 
+; ***** END LICENSE BLOCK ***** 
+
+LIBRARY         NSLDIF32V6.0
+DESCRIPTION     'Lightweight Directory Access Protocol LDIF Client API for 32-bit Windows'
+VERSION		60
+HEAPSIZE        4096
+
+EXPORTS
+; we need to manually assign ordinal numbers so we can add new routines
+; and not disturb the ordinals and thus not require callers to relink.
+; 
+; exports list (generated by genexports.pl)
+; 
+
+	ldif_parse_line		@3001
+	ldif_getline		@3002
+	ldif_put_type_and_value		@3003
+	ldif_put_type_and_value_nowrap		@3004
+	ldif_put_type_and_value_with_options		@3005
+	ldif_type_and_value		@3006
+	ldif_type_and_value_nowrap		@3007
+	ldif_type_and_value_with_options		@3008
+	ldif_base64_decode		@3009
+	ldif_base64_encode		@3010
+	ldif_base64_encode_nowrap		@3011
+	ldif_get_entry		@3012
+; 
+; end of generated exports list.
--- a/directory/c-sdk/ldap/libraries/msdos/winsock/nsldif32.tdf
+++ b/directory/c-sdk/ldap/libraries/msdos/winsock/nsldif32.tdf
@ -0,0 +1,46 @@
+;
+; ***** BEGIN LICENSE BLOCK *****
+; Version: MPL 1.1/GPL 2.0/LGPL 2.1
+; 
+; The contents of this file are subject to the Mozilla Public License Version 
+; 1.1 (the "License"); you may not use this file except in compliance with 
+; the License. You may obtain a copy of the License at 
+; http://www.mozilla.org/MPL/
+; 
+; Software distributed under the License is distributed on an "AS IS" basis,
+; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+; for the specific language governing rights and limitations under the
+; License.
+; 
+; The Original Code is Mozilla Communicator client code.
+; 
+; The Initial Developer of the Original Code is
+; Netscape Communications Corporation.
+; Portions created by the Initial Developer are Copyright (C) 1996-1999
+; the Initial Developer. All Rights Reserved.
+; 
+; Contributor(s):
+; 
+; Alternatively, the contents of this file may be used under the terms of
+; either of the GNU General Public License Version 2 or later (the "GPL"),
+; or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+; in which case the provisions of the GPL or the LGPL are applicable instead
+; of those above. If you wish to allow use of your version of this file only
+; under the terms of either the GPL or the LGPL, and not to allow others to
+; use your version of this file under the terms of the MPL, indicate your
+; decision by deleting the provisions above and replace them with the notice
+; and other provisions required by the GPL or the LGPL. If you do not delete
+; the provisions above, a recipient may use your version of this file under
+; the terms of any one of the MPL, the GPL or the LGPL.
+; 
+; ***** END LICENSE BLOCK ***** 
+
+LIBRARY         NSLDIF32V$1
+DESCRIPTION     'Lightweight Directory Access Protocol LDIF Client API for 32-bit Windows'
+VERSION		$2
+HEAPSIZE        4096
+
+EXPORTS
+; we need to manually assign ordinal numbers so we can add new routines
+; and not disturb the ordinals and thus not require callers to relink.
+$EXPORTS
--- a/directory/c-sdk/mozldap.spec
+++ b/directory/c-sdk/mozldap.spec
@ -7,13 +7,13 @@

 %define major           6
 %define minor           0
-%define submin          1
+%define submin          2
 %define libsuffix       %{major}0

 Summary:          Mozilla LDAP C SDK
 Name:             mozldap
 Version:          %{major}.%{minor}.%{submin}
-Release:          2%{?dist}
+Release:          1%{?dist}
 License:          MPL/GPL/LGPL
 URL:              http://www.mozilla.org/directory/csdk.html
 Group:            System Environment/Libraries
@ -186,6 +186,10 @@ cp -r mozilla/directory/c-sdk/ldap/examples $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{_datadir}/%{name}

 %changelog
+* Mon Jan 15 2007 Rich Megginson <richm@stanfordalumni.org> - 6.0.2-1
+- Fixed exports file generation for Solaris and Windows - no effect on linux
+- bumped version to 6.0.2
+
 * Mon Jan  9 2007 Rich Megginson <richm@stanfordalumni.org> - 6.0.1-2
 - Remove buildroot = "/" checking
 - Remove buildroot removal from %%build section