summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am42
-rw-r--r--Makefile.in171
-rwxr-xr-xconfigure6
-rw-r--r--configure.ac2
-rw-r--r--include/i18n.h115
-rw-r--r--ldap/servers/slapd/back-ldbm/ldif2ldbm.c2
-rw-r--r--ldap/servers/slapd/bind.c76
-rw-r--r--ldap/servers/slapd/ldaputil.c75
-rw-r--r--lib/libsi18n/coreres.c141
-rw-r--r--lib/libsi18n/coreres.h52
-rw-r--r--lib/libsi18n/getlang.c330
-rw-r--r--lib/libsi18n/getstrmem.c160
-rw-r--r--lib/libsi18n/getstrprop.c85
-rw-r--r--lib/libsi18n/propset.c442
-rw-r--r--lib/libsi18n/propset.h80
15 files changed, 217 insertions, 1562 deletions
diff --git a/Makefile.am b/Makefile.am
index aef110fe..671bb1ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,8 @@ PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_in
# We need to make sure that libpthread is linked before libc on HP-UX.
if HPUX
AM_LDFLAGS = -lpthread
+#else
+#AM_LDFLAGS = -Wl,-z,defs
endif
#------------------------
@@ -62,6 +64,7 @@ LIBDL=@LIBDL@
LIBCSTD=@LIBCSTD@
LIBCRUN=@LIBCRUN@
THREADLIB=@THREADLIB@
+LIBCRYPT=@LIBCRYPT@
#------------------------
# Generated Sources
@@ -530,16 +533,13 @@ libns_dshttpd_la_SOURCES = lib/libaccess/access_plhash.cpp \
lib/base/system.cpp \
lib/base/systhr.cpp \
lib/base/util.cpp \
- lib/libsi18n/coreres.c \
lib/libsi18n/getstrprop.c \
- lib/libsi18n/getlang.c \
- lib/libsi18n/propset.c \
lib/libsi18n/reshash.c \
lib/libsi18n/txtfile.c \
$(libldaputil_a_SOURCES)
libns_dshttpd_la_CPPFLAGS = -I$(srcdir)/include/base $(AM_CPPFLAGS) -I$(srcdir)/lib/ldaputil @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-libns_dshttpd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK)
+libns_dshttpd_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK)
#------------------------
# libslapd
@@ -643,7 +643,7 @@ if SOLARIS
libslapd_la_SOURCES += ldap/servers/slapd/slapi_counter_sunos_sparcv9.S
endif
-libslapd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(NSS_LINK) $(NSPR_LINK) $(KERBEROS_LINK) $(PCRE_LINK)
+libslapd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(NSS_LINK) $(NSPR_LINK) $(KERBEROS_LINK) $(PCRE_LINK) $(THREADLIB)
#////////////////////////////////////////////////////////////////
@@ -717,7 +717,7 @@ libback_ldbm_la_SOURCES = ldap/servers/slapd/back-ldbm/ancestorid.c \
ldap/servers/slapd/back-ldbm/vlv_srch.c
libback_ldbm_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @db_inc@
-libback_ldbm_la_LIBADD = libslapd.la $(DB_LINK)
+libback_ldbm_la_LIBADD = libslapd.la $(DB_LINK) $(LDAPSDK_LINK) $(NSPR_LINK)
libback_ldbm_la_LDFLAGS = -avoid-version
#------------------------
@@ -737,7 +737,7 @@ libacl_plugin_la_SOURCES = ldap/servers/plugins/acl/acl.c \
ldap/servers/plugins/acl/aclutil.c
libacl_plugin_la_CPPFLAGS = -I$(srcdir)/include/libaccess $(PLUGIN_CPPFLAGS)
-libacl_plugin_la_LIBADD = libns-dshttpd.la $(LIBCSTD) $(LIBCRUN)
+libacl_plugin_la_LIBADD = libslapd.la libns-dshttpd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(LIBCSTD) $(LIBCRUN)
libacl_plugin_la_LDFLAGS = -avoid-version
libacl_plugin_la_LINK = $(CXXLINK) -avoid-version
@@ -749,6 +749,7 @@ libattr_unique_plugin_la_SOURCES = ldap/servers/plugins/uiduniq/7bit.c \
ldap/servers/plugins/shared/utils.c
libattr_unique_plugin_la_CPPFLAGS = -I$(srcdir)/ldap/servers/plugins/shared $(PLUGIN_CPPFLAGS)
+libattr_unique_plugin_la_LIBADD = libslapd.la $(NSPR_LINK)
libattr_unique_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -757,6 +758,7 @@ libattr_unique_plugin_la_LDFLAGS = -avoid-version
libbitwise_plugin_la_SOURCES = ldap/servers/plugins/bitwise/bitwise.c
libbitwise_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libbitwise_plugin_la_LIBADD = libslapd.la
libbitwise_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -789,6 +791,7 @@ libchainingdb_plugin_la_SOURCES = ldap/servers/plugins/chainingdb/cb_abandon.c \
ldap/servers/plugins/chainingdb/cb_utils.c
libchainingdb_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libchainingdb_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libchainingdb_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -799,7 +802,7 @@ libcollation_plugin_la_SOURCES = ldap/servers/plugins/collation/collate.c \
ldap/servers/plugins/collation/orfilter.c
libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS)
-libcollation_plugin_la_LIBADD = $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
+libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
libcollation_plugin_la_LDFLAGS = -avoid-version
libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version
@@ -810,6 +813,7 @@ libcos_plugin_la_SOURCES = ldap/servers/plugins/cos/cos.c \
ldap/servers/plugins/cos/cos_cache.c
libcos_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libcos_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libcos_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -818,6 +822,7 @@ libcos_plugin_la_LDFLAGS = -avoid-version
libderef_plugin_la_SOURCES = ldap/servers/plugins/deref/deref.c
libderef_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libderef_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libderef_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -827,6 +832,7 @@ libdes_plugin_la_SOURCES = ldap/servers/plugins/rever/des.c \
ldap/servers/plugins/rever/rever.c
libdes_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @svrcore_inc@
+libdes_plugin_la_LIBADD = libslapd.la $(NSS_LINK)
libdes_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -835,6 +841,7 @@ libdes_plugin_la_LDFLAGS = -avoid-version
libdistrib_plugin_la_SOURCES = ldap/servers/plugins/distrib/distrib.c
libdistrib_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libdistrib_plugin_la_LIBADD = libslapd.la
libdistrib_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -843,6 +850,7 @@ libdistrib_plugin_la_LDFLAGS = -avoid-version
libdna_plugin_la_SOURCES = ldap/servers/plugins/dna/dna.c
libdna_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libdna_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libdna_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -852,6 +860,7 @@ libhttp_client_plugin_la_SOURCES = ldap/servers/plugins/http/http_client.c \
ldap/servers/plugins/http/http_impl.c
libhttp_client_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libhttp_client_plugin_la_LIBADD = libslapd.la $(NSS_LINK) $(NSPR_LINK)
libhttp_client_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -861,6 +870,7 @@ liblinkedattrs_plugin_la_SOURCES = ldap/servers/plugins/linkedattrs/fixup_task.c
ldap/servers/plugins/linkedattrs/linked_attrs.c
liblinkedattrs_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+liblinkedattrs_plugin_la_LIBADD = libslapd.la $(NSPR_LINK)
liblinkedattrs_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -870,6 +880,7 @@ libmemberof_plugin_la_SOURCES= ldap/servers/plugins/memberof/memberof.c \
ldap/servers/plugins/memberof/memberof_config.c
libmemberof_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libmemberof_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libmemberof_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -881,7 +892,7 @@ libpam_passthru_plugin_la_SOURCES = ldap/servers/plugins/pam_passthru/pam_ptconf
ldap/servers/plugins/pam_passthru/pam_ptpreop.c
libpam_passthru_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
-libpam_passthru_plugin_la_LIBADD = $(PAM_LINK)
+libpam_passthru_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(PAM_LINK)
libpam_passthru_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -895,6 +906,7 @@ libpassthru_plugin_la_SOURCES = ldap/servers/plugins/passthru/ptbind.c \
ldap/servers/plugins/passthru/ptutil.c
libpassthru_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libpassthru_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libpassthru_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -903,6 +915,7 @@ libpassthru_plugin_la_LDFLAGS = -avoid-version
libpresence_plugin_la_SOURCES = ldap/servers/plugins/presence/presence.c
libpresence_plugin_la_CPPFLAGS = -I$(srcdir)/ldap/servers/plugins/http $(PLUGIN_CPPFLAGS)
+libpresence_plugin_la_LIBADD = libslapd.la
libpresence_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -920,6 +933,7 @@ libpwdstorage_plugin_la_SOURCES = ldap/servers/plugins/pwdstorage/clear_pwd.c \
ldap/servers/plugins/pwdstorage/ssha_pwd.c
libpwdstorage_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libpwdstorage_plugin_la_LIBADD = libslapd.la $(NSS_LINK) $(NSPR_LINK) $(LIBCRYPT)
libpwdstorage_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -928,6 +942,7 @@ libpwdstorage_plugin_la_LDFLAGS = -avoid-version
libreferint_plugin_la_SOURCES = ldap/servers/plugins/referint/referint.c
libreferint_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libreferint_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libreferint_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -989,7 +1004,7 @@ libreplication_plugin_la_SOURCES = ldap/servers/plugins/replication/cl5_api.c \
ldap/servers/plugins/replication/windows_tot_protocol.c
libreplication_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@ @db_inc@
-libreplication_plugin_la_LIBADD = $(ICU_LINK) $(DB_LINK)
+libreplication_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) $(ICU_LINK) $(DB_LINK)
libreplication_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1003,6 +1018,7 @@ libretrocl_plugin_la_SOURCES = ldap/servers/plugins/retrocl/retrocl.c \
ldap/servers/plugins/retrocl/retrocl_trim.c
libretrocl_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libretrocl_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libretrocl_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1012,6 +1028,7 @@ libroles_plugin_la_SOURCES = ldap/servers/plugins/roles/roles_cache.c \
ldap/servers/plugins/roles/roles_plugin.c
libroles_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libroles_plugin_la_LIBADD = libslapd.la $(NSPR_LINK)
libroles_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1020,6 +1037,7 @@ libroles_plugin_la_LDFLAGS = -avoid-version
libschemareload_plugin_la_SOURCES = ldap/servers/plugins/schema_reload/schema_reload.c
libschemareload_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libschemareload_plugin_la_LIBADD = libslapd.la $(NSPR_LINK)
libschemareload_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1028,6 +1046,7 @@ libschemareload_plugin_la_LDFLAGS = -avoid-version
libstatechange_plugin_la_SOURCES = ldap/servers/plugins/statechange/statechange.c
libstatechange_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libstatechange_plugin_la_LIBADD = libslapd.la
libstatechange_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1057,6 +1076,7 @@ libsyntax_plugin_la_SOURCES = ldap/servers/plugins/syntaxes/bin.c \
ldap/servers/plugins/syntaxes/value.c
libsyntax_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libsyntax_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libsyntax_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1066,6 +1086,7 @@ libusn_plugin_la_SOURCES = ldap/servers/plugins/usn/usn.c \
ldap/servers/plugins/usn/usn_cleanup.c
libusn_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libusn_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libusn_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1074,6 +1095,7 @@ libusn_plugin_la_LDFLAGS = -avoid-version
libviews_plugin_la_SOURCES = ldap/servers/plugins/views/views.c
libviews_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libviews_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libviews_plugin_la_LDFLAGS = -avoid-version
diff --git a/Makefile.in b/Makefile.in
index 8f6a5853..e8523d23 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -108,8 +108,9 @@ serverLTLIBRARIES_INSTALL = $(INSTALL)
serverpluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libacl_plugin_la_DEPENDENCIES = libns-dshttpd.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+libacl_plugin_la_DEPENDENCIES = libslapd.la libns-dshttpd.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libacl_plugin_la_OBJECTS = \
ldap/servers/plugins/acl/libacl_plugin_la-acl.lo \
ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo \
@@ -124,14 +125,16 @@ am_libacl_plugin_la_OBJECTS = \
ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo \
ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo
libacl_plugin_la_OBJECTS = $(am_libacl_plugin_la_OBJECTS)
-libattr_unique_plugin_la_LIBADD =
+libattr_unique_plugin_la_DEPENDENCIES = libslapd.la \
+ $(am__DEPENDENCIES_1)
am_libattr_unique_plugin_la_OBJECTS = \
ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo \
ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo \
ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo
libattr_unique_plugin_la_OBJECTS = \
$(am_libattr_unique_plugin_la_OBJECTS)
-libback_ldbm_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1)
+libback_ldbm_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libback_ldbm_la_OBJECTS = \
ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo \
ldap/servers/slapd/back-ldbm/libback_ldbm_la-archive.lo \
@@ -195,13 +198,14 @@ am_libback_ldbm_la_OBJECTS = \
ldap/servers/slapd/back-ldbm/libback_ldbm_la-vlv_key.lo \
ldap/servers/slapd/back-ldbm/libback_ldbm_la-vlv_srch.lo
libback_ldbm_la_OBJECTS = $(am_libback_ldbm_la_OBJECTS)
-libbitwise_plugin_la_LIBADD =
+libbitwise_plugin_la_DEPENDENCIES = libslapd.la
am_libbitwise_plugin_la_OBJECTS = \
ldap/servers/plugins/bitwise/libbitwise_plugin_la-bitwise.lo
libbitwise_plugin_la_OBJECTS = $(am_libbitwise_plugin_la_OBJECTS)
@enable_bitwise_TRUE@am_libbitwise_plugin_la_rpath = -rpath \
@enable_bitwise_TRUE@ $(serverplugindir)
-libchainingdb_plugin_la_LIBADD =
+libchainingdb_plugin_la_DEPENDENCIES = libslapd.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libchainingdb_plugin_la_OBJECTS = ldap/servers/plugins/chainingdb/libchainingdb_plugin_la-cb_abandon.lo \
ldap/servers/plugins/chainingdb/libchainingdb_plugin_la-cb_acl.lo \
ldap/servers/plugins/chainingdb/libchainingdb_plugin_la-cb_add.lo \
@@ -229,50 +233,58 @@ am_libchainingdb_plugin_la_OBJECTS = ldap/servers/plugins/chainingdb/libchaining
ldap/servers/plugins/chainingdb/libchainingdb_plugin_la-cb_utils.lo
libchainingdb_plugin_la_OBJECTS = \
$(am_libchainingdb_plugin_la_OBJECTS)
-libcollation_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+libcollation_plugin_la_DEPENDENCIES = libslapd.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libcollation_plugin_la_OBJECTS = ldap/servers/plugins/collation/libcollation_plugin_la-collate.lo \
ldap/servers/plugins/collation/libcollation_plugin_la-config.lo \
ldap/servers/plugins/collation/libcollation_plugin_la-orfilter.lo
libcollation_plugin_la_OBJECTS = $(am_libcollation_plugin_la_OBJECTS)
-libcos_plugin_la_LIBADD =
+libcos_plugin_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libcos_plugin_la_OBJECTS = \
ldap/servers/plugins/cos/libcos_plugin_la-cos.lo \
ldap/servers/plugins/cos/libcos_plugin_la-cos_cache.lo
libcos_plugin_la_OBJECTS = $(am_libcos_plugin_la_OBJECTS)
-libderef_plugin_la_LIBADD =
+libderef_plugin_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libderef_plugin_la_OBJECTS = \
ldap/servers/plugins/deref/libderef_plugin_la-deref.lo
libderef_plugin_la_OBJECTS = $(am_libderef_plugin_la_OBJECTS)
-libdes_plugin_la_LIBADD =
+libdes_plugin_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1)
am_libdes_plugin_la_OBJECTS = \
ldap/servers/plugins/rever/libdes_plugin_la-des.lo \
ldap/servers/plugins/rever/libdes_plugin_la-rever.lo
libdes_plugin_la_OBJECTS = $(am_libdes_plugin_la_OBJECTS)
-libdistrib_plugin_la_LIBADD =
+libdistrib_plugin_la_DEPENDENCIES = libslapd.la
am_libdistrib_plugin_la_OBJECTS = \
ldap/servers/plugins/distrib/libdistrib_plugin_la-distrib.lo
libdistrib_plugin_la_OBJECTS = $(am_libdistrib_plugin_la_OBJECTS)
-libdna_plugin_la_LIBADD =
+libdna_plugin_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libdna_plugin_la_OBJECTS = \
ldap/servers/plugins/dna/libdna_plugin_la-dna.lo
libdna_plugin_la_OBJECTS = $(am_libdna_plugin_la_OBJECTS)
@enable_dna_TRUE@am_libdna_plugin_la_rpath = -rpath $(serverplugindir)
-libhttp_client_plugin_la_LIBADD =
+libhttp_client_plugin_la_DEPENDENCIES = libslapd.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libhttp_client_plugin_la_OBJECTS = ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo \
ldap/servers/plugins/http/libhttp_client_plugin_la-http_impl.lo
libhttp_client_plugin_la_OBJECTS = \
$(am_libhttp_client_plugin_la_OBJECTS)
-liblinkedattrs_plugin_la_LIBADD =
+liblinkedattrs_plugin_la_DEPENDENCIES = libslapd.la \
+ $(am__DEPENDENCIES_1)
am_liblinkedattrs_plugin_la_OBJECTS = ldap/servers/plugins/linkedattrs/liblinkedattrs_plugin_la-fixup_task.lo \
ldap/servers/plugins/linkedattrs/liblinkedattrs_plugin_la-linked_attrs.lo
liblinkedattrs_plugin_la_OBJECTS = \
$(am_liblinkedattrs_plugin_la_OBJECTS)
-libmemberof_plugin_la_LIBADD =
+libmemberof_plugin_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libmemberof_plugin_la_OBJECTS = ldap/servers/plugins/memberof/libmemberof_plugin_la-memberof.lo \
ldap/servers/plugins/memberof/libmemberof_plugin_la-memberof_config.lo
libmemberof_plugin_la_OBJECTS = $(am_libmemberof_plugin_la_OBJECTS)
-libns_dshttpd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+libns_dshttpd_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am__objects_1 = lib/ldaputil/libns_dshttpd_la-cert.lo \
@@ -327,14 +339,13 @@ am_libns_dshttpd_la_OBJECTS = \
lib/base/libns_dshttpd_la-system.lo \
lib/base/libns_dshttpd_la-systhr.lo \
lib/base/libns_dshttpd_la-util.lo \
- lib/libsi18n/libns_dshttpd_la-coreres.lo \
lib/libsi18n/libns_dshttpd_la-getstrprop.lo \
- lib/libsi18n/libns_dshttpd_la-getlang.lo \
- lib/libsi18n/libns_dshttpd_la-propset.lo \
lib/libsi18n/libns_dshttpd_la-reshash.lo \
lib/libsi18n/libns_dshttpd_la-txtfile.lo $(am__objects_1)
libns_dshttpd_la_OBJECTS = $(am_libns_dshttpd_la_OBJECTS)
-libpam_passthru_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libpam_passthru_plugin_la_DEPENDENCIES = libslapd.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libpam_passthru_plugin_la_OBJECTS = ldap/servers/plugins/pam_passthru/libpam_passthru_plugin_la-pam_ptconfig.lo \
ldap/servers/plugins/pam_passthru/libpam_passthru_plugin_la-pam_ptdebug.lo \
ldap/servers/plugins/pam_passthru/libpam_passthru_plugin_la-pam_ptimpl.lo \
@@ -343,7 +354,8 @@ libpam_passthru_plugin_la_OBJECTS = \
$(am_libpam_passthru_plugin_la_OBJECTS)
@enable_pam_passthru_TRUE@am_libpam_passthru_plugin_la_rpath = -rpath \
@enable_pam_passthru_TRUE@ $(serverplugindir)
-libpassthru_plugin_la_LIBADD =
+libpassthru_plugin_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libpassthru_plugin_la_OBJECTS = \
ldap/servers/plugins/passthru/libpassthru_plugin_la-ptbind.lo \
ldap/servers/plugins/passthru/libpassthru_plugin_la-ptconfig.lo \
@@ -352,12 +364,14 @@ am_libpassthru_plugin_la_OBJECTS = \
ldap/servers/plugins/passthru/libpassthru_plugin_la-ptpreop.lo \
ldap/servers/plugins/passthru/libpassthru_plugin_la-ptutil.lo
libpassthru_plugin_la_OBJECTS = $(am_libpassthru_plugin_la_OBJECTS)
-libpresence_plugin_la_LIBADD =
+libpresence_plugin_la_DEPENDENCIES = libslapd.la
am_libpresence_plugin_la_OBJECTS = ldap/servers/plugins/presence/libpresence_plugin_la-presence.lo
libpresence_plugin_la_OBJECTS = $(am_libpresence_plugin_la_OBJECTS)
@enable_presence_TRUE@am_libpresence_plugin_la_rpath = -rpath \
@enable_presence_TRUE@ $(serverplugindir)
-libpwdstorage_plugin_la_LIBADD =
+libpwdstorage_plugin_la_DEPENDENCIES = libslapd.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libpwdstorage_plugin_la_OBJECTS = ldap/servers/plugins/pwdstorage/libpwdstorage_plugin_la-clear_pwd.lo \
ldap/servers/plugins/pwdstorage/libpwdstorage_plugin_la-crypt_pwd.lo \
ldap/servers/plugins/pwdstorage/libpwdstorage_plugin_la-md5_pwd.lo \
@@ -370,10 +384,13 @@ am_libpwdstorage_plugin_la_OBJECTS = ldap/servers/plugins/pwdstorage/libpwdstora
ldap/servers/plugins/pwdstorage/libpwdstorage_plugin_la-ssha_pwd.lo
libpwdstorage_plugin_la_OBJECTS = \
$(am_libpwdstorage_plugin_la_OBJECTS)
-libreferint_plugin_la_LIBADD =
+libreferint_plugin_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libreferint_plugin_la_OBJECTS = ldap/servers/plugins/referint/libreferint_plugin_la-referint.lo
libreferint_plugin_la_OBJECTS = $(am_libreferint_plugin_la_OBJECTS)
-libreplication_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+libreplication_plugin_la_DEPENDENCIES = libslapd.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_libreplication_plugin_la_OBJECTS = ldap/servers/plugins/replication/libreplication_plugin_la-cl5_api.lo \
ldap/servers/plugins/replication/libreplication_plugin_la-cl5_clcache.lo \
@@ -431,7 +448,8 @@ am_libreplication_plugin_la_OBJECTS = ldap/servers/plugins/replication/libreplic
ldap/servers/plugins/replication/libreplication_plugin_la-windows_tot_protocol.lo
libreplication_plugin_la_OBJECTS = \
$(am_libreplication_plugin_la_OBJECTS)
-libretrocl_plugin_la_LIBADD =
+libretrocl_plugin_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libretrocl_plugin_la_OBJECTS = \
ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl.lo \
ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_cn.lo \
@@ -440,12 +458,13 @@ am_libretrocl_plugin_la_OBJECTS = \
ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_rootdse.lo \
ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_trim.lo
libretrocl_plugin_la_OBJECTS = $(am_libretrocl_plugin_la_OBJECTS)
-libroles_plugin_la_LIBADD =
+libroles_plugin_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1)
am_libroles_plugin_la_OBJECTS = \
ldap/servers/plugins/roles/libroles_plugin_la-roles_cache.lo \
ldap/servers/plugins/roles/libroles_plugin_la-roles_plugin.lo
libroles_plugin_la_OBJECTS = $(am_libroles_plugin_la_OBJECTS)
-libschemareload_plugin_la_LIBADD =
+libschemareload_plugin_la_DEPENDENCIES = libslapd.la \
+ $(am__DEPENDENCIES_1)
am_libschemareload_plugin_la_OBJECTS = ldap/servers/plugins/schema_reload/libschemareload_plugin_la-schema_reload.lo
libschemareload_plugin_la_OBJECTS = \
$(am_libschemareload_plugin_la_OBJECTS)
@@ -453,7 +472,7 @@ am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
libslapd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
- $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am__libslapd_la_SOURCES_DIST = ldap/servers/slapd/add.c \
ldap/servers/slapd/agtmmap.c ldap/servers/slapd/apibroker.c \
ldap/servers/slapd/attr.c ldap/servers/slapd/attrlist.c \
@@ -605,11 +624,12 @@ am_libslapd_la_OBJECTS = ldap/servers/slapd/libslapd_la-add.lo \
ldap/servers/slapd/libslapd_la-vattr.lo $(am__objects_2) \
$(am__objects_3)
libslapd_la_OBJECTS = $(am_libslapd_la_OBJECTS)
-libstatechange_plugin_la_LIBADD =
+libstatechange_plugin_la_DEPENDENCIES = libslapd.la
am_libstatechange_plugin_la_OBJECTS = ldap/servers/plugins/statechange/libstatechange_plugin_la-statechange.lo
libstatechange_plugin_la_OBJECTS = \
$(am_libstatechange_plugin_la_OBJECTS)
-libsyntax_plugin_la_LIBADD =
+libsyntax_plugin_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libsyntax_plugin_la_OBJECTS = \
ldap/servers/plugins/syntaxes/libsyntax_plugin_la-bin.lo \
ldap/servers/plugins/syntaxes/libsyntax_plugin_la-bitstring.lo \
@@ -634,12 +654,14 @@ am_libsyntax_plugin_la_OBJECTS = \
ldap/servers/plugins/syntaxes/libsyntax_plugin_la-validate_task.lo \
ldap/servers/plugins/syntaxes/libsyntax_plugin_la-value.lo
libsyntax_plugin_la_OBJECTS = $(am_libsyntax_plugin_la_OBJECTS)
-libusn_plugin_la_LIBADD =
+libusn_plugin_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libusn_plugin_la_OBJECTS = \
ldap/servers/plugins/usn/libusn_plugin_la-usn.lo \
ldap/servers/plugins/usn/libusn_plugin_la-usn_cleanup.lo
libusn_plugin_la_OBJECTS = $(am_libusn_plugin_la_OBJECTS)
-libviews_plugin_la_LIBADD =
+libviews_plugin_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_libviews_plugin_la_OBJECTS = \
ldap/servers/plugins/views/libviews_plugin_la-views.lo
libviews_plugin_la_OBJECTS = $(am_libviews_plugin_la_OBJECTS)
@@ -953,6 +975,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KRB5_CONFIG_BIN = @KRB5_CONFIG_BIN@
LDFLAGS = @LDFLAGS@
LIBCRUN = @LIBCRUN@
+LIBCRYPT = @LIBCRYPT@
LIBCSTD = @LIBCSTD@
LIBDL = @LIBDL@
LIBNSL = @LIBNSL@
@@ -1154,6 +1177,8 @@ AM_CPPFLAGS = $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES)
PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
# We need to make sure that libpthread is linked before libc on HP-UX.
@HPUX_TRUE@AM_LDFLAGS = -lpthread
+#else
+#AM_LDFLAGS = -Wl,-z,defs
#------------------------
# Linker Flags
@@ -1573,16 +1598,13 @@ libns_dshttpd_la_SOURCES = lib/libaccess/access_plhash.cpp \
lib/base/system.cpp \
lib/base/systhr.cpp \
lib/base/util.cpp \
- lib/libsi18n/coreres.c \
lib/libsi18n/getstrprop.c \
- lib/libsi18n/getlang.c \
- lib/libsi18n/propset.c \
lib/libsi18n/reshash.c \
lib/libsi18n/txtfile.c \
$(libldaputil_a_SOURCES)
libns_dshttpd_la_CPPFLAGS = -I$(srcdir)/include/base $(AM_CPPFLAGS) -I$(srcdir)/lib/ldaputil @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-libns_dshttpd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK)
+libns_dshttpd_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK)
#------------------------
# libslapd
@@ -1642,7 +1664,7 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \
ldap/servers/slapd/valueset.c ldap/servers/slapd/vattr.c \
$(libavl_a_SOURCES) $(am__append_1)
libslapd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @sasl_inc@ @db_inc@ @svrcore_inc@ @kerberos_inc@ @pcre_inc@
-libslapd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(NSS_LINK) $(NSPR_LINK) $(KERBEROS_LINK) $(PCRE_LINK)
+libslapd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(NSS_LINK) $(NSPR_LINK) $(KERBEROS_LINK) $(PCRE_LINK) $(THREADLIB)
#////////////////////////////////////////////////////////////////
#
@@ -1715,7 +1737,7 @@ libback_ldbm_la_SOURCES = ldap/servers/slapd/back-ldbm/ancestorid.c \
ldap/servers/slapd/back-ldbm/vlv_srch.c
libback_ldbm_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @db_inc@
-libback_ldbm_la_LIBADD = libslapd.la $(DB_LINK)
+libback_ldbm_la_LIBADD = libslapd.la $(DB_LINK) $(LDAPSDK_LINK) $(NSPR_LINK)
libback_ldbm_la_LDFLAGS = -avoid-version
#------------------------
@@ -1735,7 +1757,7 @@ libacl_plugin_la_SOURCES = ldap/servers/plugins/acl/acl.c \
ldap/servers/plugins/acl/aclutil.c
libacl_plugin_la_CPPFLAGS = -I$(srcdir)/include/libaccess $(PLUGIN_CPPFLAGS)
-libacl_plugin_la_LIBADD = libns-dshttpd.la $(LIBCSTD) $(LIBCRUN)
+libacl_plugin_la_LIBADD = libslapd.la libns-dshttpd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(LIBCSTD) $(LIBCRUN)
libacl_plugin_la_LDFLAGS = -avoid-version
libacl_plugin_la_LINK = $(CXXLINK) -avoid-version
@@ -1747,6 +1769,7 @@ libattr_unique_plugin_la_SOURCES = ldap/servers/plugins/uiduniq/7bit.c \
ldap/servers/plugins/shared/utils.c
libattr_unique_plugin_la_CPPFLAGS = -I$(srcdir)/ldap/servers/plugins/shared $(PLUGIN_CPPFLAGS)
+libattr_unique_plugin_la_LIBADD = libslapd.la $(NSPR_LINK)
libattr_unique_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1754,6 +1777,7 @@ libattr_unique_plugin_la_LDFLAGS = -avoid-version
#------------------------
libbitwise_plugin_la_SOURCES = ldap/servers/plugins/bitwise/bitwise.c
libbitwise_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libbitwise_plugin_la_LIBADD = libslapd.la
libbitwise_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1786,6 +1810,7 @@ libchainingdb_plugin_la_SOURCES = ldap/servers/plugins/chainingdb/cb_abandon.c \
ldap/servers/plugins/chainingdb/cb_utils.c
libchainingdb_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libchainingdb_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libchainingdb_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1796,7 +1821,7 @@ libcollation_plugin_la_SOURCES = ldap/servers/plugins/collation/collate.c \
ldap/servers/plugins/collation/orfilter.c
libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS)
-libcollation_plugin_la_LIBADD = $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
+libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
libcollation_plugin_la_LDFLAGS = -avoid-version
libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version
@@ -1807,6 +1832,7 @@ libcos_plugin_la_SOURCES = ldap/servers/plugins/cos/cos.c \
ldap/servers/plugins/cos/cos_cache.c
libcos_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libcos_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libcos_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1814,6 +1840,7 @@ libcos_plugin_la_LDFLAGS = -avoid-version
#-----------------------
libderef_plugin_la_SOURCES = ldap/servers/plugins/deref/deref.c
libderef_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libderef_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libderef_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1823,6 +1850,7 @@ libdes_plugin_la_SOURCES = ldap/servers/plugins/rever/des.c \
ldap/servers/plugins/rever/rever.c
libdes_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @svrcore_inc@
+libdes_plugin_la_LIBADD = libslapd.la $(NSS_LINK)
libdes_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1830,6 +1858,7 @@ libdes_plugin_la_LDFLAGS = -avoid-version
#------------------------
libdistrib_plugin_la_SOURCES = ldap/servers/plugins/distrib/distrib.c
libdistrib_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libdistrib_plugin_la_LIBADD = libslapd.la
libdistrib_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1837,6 +1866,7 @@ libdistrib_plugin_la_LDFLAGS = -avoid-version
#------------------------
libdna_plugin_la_SOURCES = ldap/servers/plugins/dna/dna.c
libdna_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libdna_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libdna_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1846,6 +1876,7 @@ libhttp_client_plugin_la_SOURCES = ldap/servers/plugins/http/http_client.c \
ldap/servers/plugins/http/http_impl.c
libhttp_client_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libhttp_client_plugin_la_LIBADD = libslapd.la $(NSS_LINK) $(NSPR_LINK)
libhttp_client_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1855,6 +1886,7 @@ liblinkedattrs_plugin_la_SOURCES = ldap/servers/plugins/linkedattrs/fixup_task.c
ldap/servers/plugins/linkedattrs/linked_attrs.c
liblinkedattrs_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+liblinkedattrs_plugin_la_LIBADD = libslapd.la $(NSPR_LINK)
liblinkedattrs_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1864,6 +1896,7 @@ libmemberof_plugin_la_SOURCES = ldap/servers/plugins/memberof/memberof.c \
ldap/servers/plugins/memberof/memberof_config.c
libmemberof_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libmemberof_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libmemberof_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1875,7 +1908,7 @@ libpam_passthru_plugin_la_SOURCES = ldap/servers/plugins/pam_passthru/pam_ptconf
ldap/servers/plugins/pam_passthru/pam_ptpreop.c
libpam_passthru_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
-libpam_passthru_plugin_la_LIBADD = $(PAM_LINK)
+libpam_passthru_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(PAM_LINK)
libpam_passthru_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1889,6 +1922,7 @@ libpassthru_plugin_la_SOURCES = ldap/servers/plugins/passthru/ptbind.c \
ldap/servers/plugins/passthru/ptutil.c
libpassthru_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libpassthru_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libpassthru_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1896,6 +1930,7 @@ libpassthru_plugin_la_LDFLAGS = -avoid-version
#------------------------
libpresence_plugin_la_SOURCES = ldap/servers/plugins/presence/presence.c
libpresence_plugin_la_CPPFLAGS = -I$(srcdir)/ldap/servers/plugins/http $(PLUGIN_CPPFLAGS)
+libpresence_plugin_la_LIBADD = libslapd.la
libpresence_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1913,6 +1948,7 @@ libpwdstorage_plugin_la_SOURCES = ldap/servers/plugins/pwdstorage/clear_pwd.c \
ldap/servers/plugins/pwdstorage/ssha_pwd.c
libpwdstorage_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libpwdstorage_plugin_la_LIBADD = libslapd.la $(NSS_LINK) $(NSPR_LINK) $(LIBCRYPT)
libpwdstorage_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1920,6 +1956,7 @@ libpwdstorage_plugin_la_LDFLAGS = -avoid-version
#------------------------
libreferint_plugin_la_SOURCES = ldap/servers/plugins/referint/referint.c
libreferint_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libreferint_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libreferint_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1981,7 +2018,7 @@ libreplication_plugin_la_SOURCES = ldap/servers/plugins/replication/cl5_api.c \
ldap/servers/plugins/replication/windows_tot_protocol.c
libreplication_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@ @db_inc@
-libreplication_plugin_la_LIBADD = $(ICU_LINK) $(DB_LINK)
+libreplication_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) $(ICU_LINK) $(DB_LINK)
libreplication_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -1995,6 +2032,7 @@ libretrocl_plugin_la_SOURCES = ldap/servers/plugins/retrocl/retrocl.c \
ldap/servers/plugins/retrocl/retrocl_trim.c
libretrocl_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libretrocl_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libretrocl_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -2004,6 +2042,7 @@ libroles_plugin_la_SOURCES = ldap/servers/plugins/roles/roles_cache.c \
ldap/servers/plugins/roles/roles_plugin.c
libroles_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libroles_plugin_la_LIBADD = libslapd.la $(NSPR_LINK)
libroles_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -2011,6 +2050,7 @@ libroles_plugin_la_LDFLAGS = -avoid-version
#------------------------
libschemareload_plugin_la_SOURCES = ldap/servers/plugins/schema_reload/schema_reload.c
libschemareload_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libschemareload_plugin_la_LIBADD = libslapd.la $(NSPR_LINK)
libschemareload_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -2018,6 +2058,7 @@ libschemareload_plugin_la_LDFLAGS = -avoid-version
#------------------------
libstatechange_plugin_la_SOURCES = ldap/servers/plugins/statechange/statechange.c
libstatechange_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libstatechange_plugin_la_LIBADD = libslapd.la
libstatechange_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -2047,6 +2088,7 @@ libsyntax_plugin_la_SOURCES = ldap/servers/plugins/syntaxes/bin.c \
ldap/servers/plugins/syntaxes/value.c
libsyntax_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libsyntax_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libsyntax_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -2056,6 +2098,7 @@ libusn_plugin_la_SOURCES = ldap/servers/plugins/usn/usn.c \
ldap/servers/plugins/usn/usn_cleanup.c
libusn_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libusn_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libusn_plugin_la_LDFLAGS = -avoid-version
#------------------------
@@ -2063,6 +2106,7 @@ libusn_plugin_la_LDFLAGS = -avoid-version
#------------------------
libviews_plugin_la_SOURCES = ldap/servers/plugins/views/views.c
libviews_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libviews_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
libviews_plugin_la_LDFLAGS = -avoid-version
#////////////////////////////////////////////////////////////////
@@ -3094,18 +3138,9 @@ lib/libsi18n/$(am__dirstamp):
lib/libsi18n/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) lib/libsi18n/$(DEPDIR)
@: > lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/libns_dshttpd_la-coreres.lo: \
- lib/libsi18n/$(am__dirstamp) \
- lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
lib/libsi18n/libns_dshttpd_la-getstrprop.lo: \
lib/libsi18n/$(am__dirstamp) \
lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/libns_dshttpd_la-getlang.lo: \
- lib/libsi18n/$(am__dirstamp) \
- lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/libns_dshttpd_la-propset.lo: \
- lib/libsi18n/$(am__dirstamp) \
- lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
lib/libsi18n/libns_dshttpd_la-reshash.lo: \
lib/libsi18n/$(am__dirstamp) \
lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
@@ -5096,14 +5131,8 @@ mostlyclean-compile:
-rm -f lib/libadmin/libns_dshttpd_la-template.lo
-rm -f lib/libadmin/libns_dshttpd_la-util.$(OBJEXT)
-rm -f lib/libadmin/libns_dshttpd_la-util.lo
- -rm -f lib/libsi18n/libns_dshttpd_la-coreres.$(OBJEXT)
- -rm -f lib/libsi18n/libns_dshttpd_la-coreres.lo
- -rm -f lib/libsi18n/libns_dshttpd_la-getlang.$(OBJEXT)
- -rm -f lib/libsi18n/libns_dshttpd_la-getlang.lo
-rm -f lib/libsi18n/libns_dshttpd_la-getstrprop.$(OBJEXT)
-rm -f lib/libsi18n/libns_dshttpd_la-getstrprop.lo
- -rm -f lib/libsi18n/libns_dshttpd_la-propset.$(OBJEXT)
- -rm -f lib/libsi18n/libns_dshttpd_la-propset.lo
-rm -f lib/libsi18n/libns_dshttpd_la-reshash.$(OBJEXT)
-rm -f lib/libsi18n/libns_dshttpd_la-reshash.lo
-rm -f lib/libsi18n/libns_dshttpd_la-txtfile.$(OBJEXT)
@@ -5558,10 +5587,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@lib/libadmin/$(DEPDIR)/libns_dshttpd_la-error.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libadmin/$(DEPDIR)/libns_dshttpd_la-template.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libadmin/$(DEPDIR)/libns_dshttpd_la-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-coreres.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-getlang.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-getstrprop.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-propset.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-reshash.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-txtfile.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/makstrdb-makstrdb.Po@am__quote@
@@ -6565,13 +6591,6 @@ lib/base/libns_dshttpd_la-nscperror.lo: lib/base/nscperror.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/base/libns_dshttpd_la-nscperror.lo `test -f 'lib/base/nscperror.c' || echo '$(srcdir)/'`lib/base/nscperror.c
-lib/libsi18n/libns_dshttpd_la-coreres.lo: lib/libsi18n/coreres.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libsi18n/libns_dshttpd_la-coreres.lo -MD -MP -MF "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-coreres.Tpo" -c -o lib/libsi18n/libns_dshttpd_la-coreres.lo `test -f 'lib/libsi18n/coreres.c' || echo '$(srcdir)/'`lib/libsi18n/coreres.c; \
-@am__fastdepCC_TRUE@ then mv -f "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-coreres.Tpo" "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-coreres.Plo"; else rm -f "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-coreres.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lib/libsi18n/coreres.c' object='lib/libsi18n/libns_dshttpd_la-coreres.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libsi18n/libns_dshttpd_la-coreres.lo `test -f 'lib/libsi18n/coreres.c' || echo '$(srcdir)/'`lib/libsi18n/coreres.c
-
lib/libsi18n/libns_dshttpd_la-getstrprop.lo: lib/libsi18n/getstrprop.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libsi18n/libns_dshttpd_la-getstrprop.lo -MD -MP -MF "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-getstrprop.Tpo" -c -o lib/libsi18n/libns_dshttpd_la-getstrprop.lo `test -f 'lib/libsi18n/getstrprop.c' || echo '$(srcdir)/'`lib/libsi18n/getstrprop.c; \
@am__fastdepCC_TRUE@ then mv -f "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-getstrprop.Tpo" "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-getstrprop.Plo"; else rm -f "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-getstrprop.Tpo"; exit 1; fi
@@ -6579,20 +6598,6 @@ lib/libsi18n/libns_dshttpd_la-getstrprop.lo: lib/libsi18n/getstrprop.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libsi18n/libns_dshttpd_la-getstrprop.lo `test -f 'lib/libsi18n/getstrprop.c' || echo '$(srcdir)/'`lib/libsi18n/getstrprop.c
-lib/libsi18n/libns_dshttpd_la-getlang.lo: lib/libsi18n/getlang.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libsi18n/libns_dshttpd_la-getlang.lo -MD -MP -MF "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-getlang.Tpo" -c -o lib/libsi18n/libns_dshttpd_la-getlang.lo `test -f 'lib/libsi18n/getlang.c' || echo '$(srcdir)/'`lib/libsi18n/getlang.c; \
-@am__fastdepCC_TRUE@ then mv -f "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-getlang.Tpo" "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-getlang.Plo"; else rm -f "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-getlang.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lib/libsi18n/getlang.c' object='lib/libsi18n/libns_dshttpd_la-getlang.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libsi18n/libns_dshttpd_la-getlang.lo `test -f 'lib/libsi18n/getlang.c' || echo '$(srcdir)/'`lib/libsi18n/getlang.c
-
-lib/libsi18n/libns_dshttpd_la-propset.lo: lib/libsi18n/propset.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libsi18n/libns_dshttpd_la-propset.lo -MD -MP -MF "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-propset.Tpo" -c -o lib/libsi18n/libns_dshttpd_la-propset.lo `test -f 'lib/libsi18n/propset.c' || echo '$(srcdir)/'`lib/libsi18n/propset.c; \
-@am__fastdepCC_TRUE@ then mv -f "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-propset.Tpo" "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-propset.Plo"; else rm -f "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-propset.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lib/libsi18n/propset.c' object='lib/libsi18n/libns_dshttpd_la-propset.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libsi18n/libns_dshttpd_la-propset.lo `test -f 'lib/libsi18n/propset.c' || echo '$(srcdir)/'`lib/libsi18n/propset.c
-
lib/libsi18n/libns_dshttpd_la-reshash.lo: lib/libsi18n/reshash.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libsi18n/libns_dshttpd_la-reshash.lo -MD -MP -MF "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-reshash.Tpo" -c -o lib/libsi18n/libns_dshttpd_la-reshash.lo `test -f 'lib/libsi18n/reshash.c' || echo '$(srcdir)/'`lib/libsi18n/reshash.c; \
@am__fastdepCC_TRUE@ then mv -f "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-reshash.Tpo" "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-reshash.Plo"; else rm -f "lib/libsi18n/$(DEPDIR)/libns_dshttpd_la-reshash.Tpo"; exit 1; fi
diff --git a/configure b/configure
index e3bab588..644f1769 100755
--- a/configure
+++ b/configure
@@ -465,7 +465,7 @@ ac_includes_default="\
#endif"
ac_default_prefix=/opt/$PACKAGE_NAME
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_autobind_TRUE enable_autobind_FALSE enable_auto_dn_suffix_TRUE enable_auto_dn_suffix_FALSE enable_bitwise_TRUE enable_bitwise_FALSE enable_presence_TRUE enable_presence_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir mibdir updatedir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE THREADLIB LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG KRB5_CONFIG_BIN kerberos_inc kerberos_lib kerberos_libdir with_selinux PACKAGE_BASE_VERSION SELINUX_TRUE SELINUX_FALSE OPENLDAP_TRUE OPENLDAP_FALSE nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir openldap_inc openldap_lib openldap_libdir openldap_bindir ol_libver db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link pcre_inc pcre_lib pcre_libdir brand capbrand vendor LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_autobind_TRUE enable_autobind_FALSE enable_auto_dn_suffix_TRUE enable_auto_dn_suffix_FALSE enable_bitwise_TRUE enable_bitwise_FALSE enable_presence_TRUE enable_presence_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir mibdir updatedir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE THREADLIB LIBCRYPT LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG KRB5_CONFIG_BIN kerberos_inc kerberos_lib kerberos_libdir with_selinux PACKAGE_BASE_VERSION SELINUX_TRUE SELINUX_FALSE OPENLDAP_TRUE OPENLDAP_FALSE nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir openldap_inc openldap_lib openldap_libdir openldap_bindir ol_libver db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link pcre_inc pcre_lib pcre_libdir brand capbrand vendor LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -23666,6 +23666,9 @@ fi
THREADLIB=-lpthread
THREADLIB=$THREADLIB
+ LIBCRYPT=-lcrypt
+ LIBCRYPT=$LIBCRYPT
+
;;
ia64-hp-hpux*)
@@ -28195,6 +28198,7 @@ s,@instconfigdir@,$instconfigdir,;t t
s,@WINNT_TRUE@,$WINNT_TRUE,;t t
s,@WINNT_FALSE@,$WINNT_FALSE,;t t
s,@THREADLIB@,$THREADLIB,;t t
+s,@LIBCRYPT@,$LIBCRYPT,;t t
s,@LIBSOCKET@,$LIBSOCKET,;t t
s,@LIBNSL@,$LIBNSL,;t t
s,@LIBDL@,$LIBDL,;t t
diff --git a/configure.ac b/configure.ac
index f8ec7299..6bf9f8aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -350,6 +350,8 @@ case $host in
# some programs use the native thread library directly
THREADLIB=-lpthread
AC_SUBST([THREADLIB], [$THREADLIB])
+ LIBCRYPT=-lcrypt
+ AC_SUBST([LIBCRYPT], [$LIBCRYPT])
;;
ia64-hp-hpux*)
AC_DEFINE([XP_UNIX], [1], [UNIX])
diff --git a/include/i18n.h b/include/i18n.h
index 6a614c84..2d53b20d 100644
--- a/include/i18n.h
+++ b/include/i18n.h
@@ -166,15 +166,6 @@ extern "C"
{
#endif
-/***************************/
-/* XP_InitStringDatabase() */
-/***************************/
-
-NSAPI_PUBLIC
-void
-XP_InitStringDatabase(char* pathCWD, char* databaseName);
-
-/* Initialize the resource string database */
/******************************/
/* XP_GetStringFromDatabase() */
@@ -186,107 +177,6 @@ XP_GetStringFromDatabase(char* strLibraryName,
char* strLanguage,
int iToken);
-/* Given the LibraryName, Language and Token, extracts the string corresponding
- to that library and token from the database in the language requested and
- returns a pointer to the string. Note: Use the macros XP_GetClientStr() and
- XP_GetAdminStr() defined below to simplify source code. */
-
-/*****************/
-/* SetLanguage() */
-/*****************/
-enum
-{
- CLIENT_LANGUAGE,
- ADMIN_LANGUAGE,
- DEFAULT_LANGUAGE
-};
-
-NSAPI_PUBLIC
-extern void
-SetLanguage(int type, char *language);
-
-/* Set language for Client, Admin and Default, XP_GetStringFromDatabase will
- base on the setting to retrieve correct string for specific language */
-
-/***********************/
-/* GetClientLanguage() */
-/***********************/
-
-NSAPI_PUBLIC
-extern char*
-GetClientLanguage(void);
-
-/* Returns a pointer to a string with the name of the language requested by
- the current client; intended to be passed to XP_GetStringFromDatabase()
- and used by the front end macro XP_GetClientStr(). */
-
-/**********************/
-/* GetAdminLanguage() */
-/**********************/
-
-NSAPI_PUBLIC
-extern char*
-GetAdminLanguage(void);
-
-/* Returns a pointer to a string with the name of the language requested by
- the administrator; intended to be passed to XP_GetStringFromDatabase()
- and used by the front end macro XP_GetAdminStr(). */
-
-/************************/
-/* GetDefaultLanguage() */
-/************************/
-
-NSAPI_PUBLIC
-extern char*
-GetDefaultLanguage(void);
-
-/* Returns a pointer to a string with the name of the default language
- for the installation from the configuration file. */
-
-/************************/
-/* GetFileForLanguage() */
-/************************/
-
-NSAPI_PUBLIC
-int
-GetFileForLanguage(char* filepath,char* language,char* existingFilepath);
-
-/* Looks for a file in the appropriate language.
-
- Input: filePath,language
- filePath is of the form "/xxx/xxx/$$LANGDIR/xxx/xxx/filename"
- or of the form "/xxx/xxx/xxx/xxx/filename".
- filename may or may not have an extension.
- language is an Accept-Language list; each language-range will be
- tried as a subdirectory name and possibly as a filename modifier.
- "*" is ignored - default always provided if needed.
- "-" is replaced by "_".
- $$LANGDIR is a special string replaced by language. It is optional.
- For the default case, $$LANGDIR/ is replaced by nothing
- (so // is not created).
-
- Returned: existingPath
- existingFilePath is the path of a satisfactory, existing file.
- if no file is found, an empty string "" is returned.
-
- int returned: -1 if no file found (existingFilePath = "")
- 0 if default file is returned
- 1 if language file is returned (any in list) */
-
-/********************/
-/* XP_AccLangList() */
-/********************/
-
-#define MAX_ACCEPT_LANGUAGE 16
-#define MAX_ACCEPT_LENGTH 18
-
-typedef char ACCEPT_LANGUAGE_LIST[MAX_ACCEPT_LANGUAGE][MAX_ACCEPT_LENGTH];
-
-NSAPI_PUBLIC
-int
-XP_AccLangList(char* AcceptLanguage,
- ACCEPT_LANGUAGE_LIST AcceptLanguageList);
-
#ifdef __cplusplus
}
#endif
@@ -314,11 +204,6 @@ extern void XP_PrintStringDatabase(void);
* (need one argument instead of three)
*/
-#define XP_GetClientStr(DBTTokenName) \
- XP_GetStringFromDatabase(LIBRARY_NAME, \
- GetClientLanguage(), \
- DBTTokenName)
-
#define XP_GetAdminStr(DBTTokenName) \
XP_GetStringFromDatabase(LIBRARY_NAME, \
"en", \
diff --git a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
index ce79c6fe..e5faa27d 100644
--- a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
+++ b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
@@ -1951,7 +1951,7 @@ ldbm_back_ldbm2index(Slapi_PBlock *pb)
&psrdn, NULL, 0,
run_from_cmdline, NULL);
if (rc) {
- LDAPDebugArg(LDAP_DEBUG_ANY,
+ LDAPDebug1Arg(LDAP_DEBUG_ANY,
"ldbm2ldif: Failed to get dn of ID "
"%d\n", pid);
slapi_ch_free_string(&rdn);
diff --git a/ldap/servers/slapd/bind.c b/ldap/servers/slapd/bind.c
index 79d8c5cf..8c5bc6ba 100644
--- a/ldap/servers/slapd/bind.c
+++ b/ldap/servers/slapd/bind.c
@@ -804,79 +804,3 @@ log_bind_access (
method, version );
}
}
-
-
-void
-slapi_add_auth_response_control( Slapi_PBlock *pb, const char *binddn )
-{
- LDAPControl arctrl;
- char dnbuf_fixedsize[ 512 ], *dnbuf, *dnbuf_dynamic = NULL;
- size_t dnlen;
-
- if ( NULL == binddn ) {
- binddn = "";
- }
- dnlen = strlen( binddn );
-
- /*
- * According to draft-weltman-ldapv3-auth-response-03.txt section
- * 4 (Authentication Response Control):
- *
- * The controlType is "2.16.840.1.113730.3.4.15". If the bind request
- * succeeded and resulted in an identity (not anonymous), the
- * controlValue contains the authorization identity [AUTH] granted to
- * the requestor. If the bind request resulted in anonymous
- * authentication, the controlValue field is a string of zero length.
- *
- * [AUTH] is a reference to RFC 2829, which in section 9 defines
- * authorization identity as:
- *
- *
- * The authorization identity is a string in the UTF-8 character set,
- * corresponding to the following ABNF [7]:
- *
- * ; Specific predefined authorization (authz) id schemes are
- * ; defined below -- new schemes may be defined in the future.
- *
- * authzId = dnAuthzId / uAuthzId
- *
- * ; distinguished-name-based authz id.
- * dnAuthzId = "dn:" dn
- * dn = utf8string ; with syntax defined in RFC 2253
- *
- * ; unspecified userid, UTF-8 encoded.
- * uAuthzId = "u:" userid
- * userid = utf8string ; syntax unspecified
- *
- * A utf8string is defined to be the UTF-8 encoding of one or more ISO
- * 10646 characters.
- *
- * We always map identities to DNs, so we always use the dnAuthzId form.
- */
- arctrl.ldctl_oid = LDAP_CONTROL_AUTH_RESPONSE;
- arctrl.ldctl_iscritical = 0;
-
- if ( dnlen == 0 ) { /* anonymous -- return zero length value */
- arctrl.ldctl_value.bv_val = "";
- arctrl.ldctl_value.bv_len = 0;
- } else { /* mapped to a DN -- return "dn:<DN>" */
- if ( 3 + dnlen < sizeof( dnbuf_fixedsize )) {
- dnbuf = dnbuf_fixedsize;
- } else {
- dnbuf = dnbuf_dynamic = slapi_ch_malloc( 4 + dnlen );
- }
- strcpy( dnbuf, "dn:" );
- strcpy( dnbuf + 3, binddn );
- arctrl.ldctl_value.bv_val = dnbuf;
- arctrl.ldctl_value.bv_len = 3 + dnlen;
- }
-
- if ( slapi_pblock_set( pb, SLAPI_ADD_RESCONTROL, &arctrl ) != 0 ) {
- slapi_log_error( SLAPI_LOG_FATAL, "bind",
- "unable to add authentication response control" );
- }
-
- if ( NULL != dnbuf_dynamic ) {
- slapi_ch_free_string( &dnbuf_dynamic );
- }
-}
diff --git a/ldap/servers/slapd/ldaputil.c b/ldap/servers/slapd/ldaputil.c
index 9c69254f..2c5b0c9b 100644
--- a/ldap/servers/slapd/ldaputil.c
+++ b/ldap/servers/slapd/ldaputil.c
@@ -768,6 +768,81 @@ done:
return rc;
}
+void
+slapi_add_auth_response_control( Slapi_PBlock *pb, const char *binddn )
+{
+ LDAPControl arctrl;
+ char dnbuf_fixedsize[ 512 ], *dnbuf, *dnbuf_dynamic = NULL;
+ size_t dnlen;
+
+ if ( NULL == binddn ) {
+ binddn = "";
+ }
+ dnlen = strlen( binddn );
+
+ /*
+ * According to draft-weltman-ldapv3-auth-response-03.txt section
+ * 4 (Authentication Response Control):
+ *
+ * The controlType is "2.16.840.1.113730.3.4.15". If the bind request
+ * succeeded and resulted in an identity (not anonymous), the
+ * controlValue contains the authorization identity [AUTH] granted to
+ * the requestor. If the bind request resulted in anonymous
+ * authentication, the controlValue field is a string of zero length.
+ *
+ * [AUTH] is a reference to RFC 2829, which in section 9 defines
+ * authorization identity as:
+ *
+ *
+ * The authorization identity is a string in the UTF-8 character set,
+ * corresponding to the following ABNF [7]:
+ *
+ * ; Specific predefined authorization (authz) id schemes are
+ * ; defined below -- new schemes may be defined in the future.
+ *
+ * authzId = dnAuthzId / uAuthzId
+ *
+ * ; distinguished-name-based authz id.
+ * dnAuthzId = "dn:" dn
+ * dn = utf8string ; with syntax defined in RFC 2253
+ *
+ * ; unspecified userid, UTF-8 encoded.
+ * uAuthzId = "u:" userid
+ * userid = utf8string ; syntax unspecified
+ *
+ * A utf8string is defined to be the UTF-8 encoding of one or more ISO
+ * 10646 characters.
+ *
+ * We always map identities to DNs, so we always use the dnAuthzId form.
+ */
+ arctrl.ldctl_oid = LDAP_CONTROL_AUTH_RESPONSE;
+ arctrl.ldctl_iscritical = 0;
+
+ if ( dnlen == 0 ) { /* anonymous -- return zero length value */
+ arctrl.ldctl_value.bv_val = "";
+ arctrl.ldctl_value.bv_len = 0;
+ } else { /* mapped to a DN -- return "dn:<DN>" */
+ if ( 3 + dnlen < sizeof( dnbuf_fixedsize )) {
+ dnbuf = dnbuf_fixedsize;
+ } else {
+ dnbuf = dnbuf_dynamic = slapi_ch_malloc( 4 + dnlen );
+ }
+ strcpy( dnbuf, "dn:" );
+ strcpy( dnbuf + 3, binddn );
+ arctrl.ldctl_value.bv_val = dnbuf;
+ arctrl.ldctl_value.bv_len = 3 + dnlen;
+ }
+
+ if ( slapi_pblock_set( pb, SLAPI_ADD_RESCONTROL, &arctrl ) != 0 ) {
+ slapi_log_error( SLAPI_LOG_FATAL, "bind",
+ "unable to add authentication response control" );
+ }
+
+ if ( NULL != dnbuf_dynamic ) {
+ slapi_ch_free_string( &dnbuf_dynamic );
+ }
+}
+
/* the following implements the client side of sasl bind, for LDAP server
-> LDAP server SASL */
diff --git a/lib/libsi18n/coreres.c b/lib/libsi18n/coreres.c
deleted file mode 100644
index e20d07a6..00000000
--- a/lib/libsi18n/coreres.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- *
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include "i18n.h"
-
-#include "propset.h"
-
-#include "coreres.h"
-
-Resource* core_res_init_resource(const char* path, const char* package)
-{
- PropertiesSet *propset;
- char *directory;
- char *filename;
- char *file_path;
- char *p, *q;
- char *filep;
- Resource *hres;
-
- /*********************
- Create full path information
- eg. ./es40/admin and cgi.bin.start ==>
- ./es40/admin/cgi/bin/start.properties
- **********************/
- file_path = (char *) malloc (strlen(path) + strlen(package) + 20);
-
-
- strcpy(file_path, path);
- if (path[strlen(path)-1] != '/')
- strcat(file_path, "/");
-
- p = file_path + strlen(file_path);
- q = (char *) package;
-
- filep = p - 1;
-
- /* Append package to file_path
- p: end positon of path + 1
- q: start position of package
- */
- while (q && *q) {
- if (*q == '.') {
- filep = q;
- *p ++ = '/';
- }
- else
- *p ++ = *q ++;
-
- }
- *p = '\0';
-
- *filep = '\0';
- filename = filep + 1;
- directory = file_path;
-
- propset = PropertiesInit (directory, filename);
-
- if (propset == NULL)
- return NULL;
-
- hres = (Resource *) malloc(sizeof(Resource));
- memset(hres, 0, sizeof(Resource));
-
- hres->path = strdup(file_path);
- hres->propset = propset;
-
- if (file_path)
- free (file_path);
-
- return hres;
-}
-
-const char *core_res_getstring(Resource *hres, char *key, ACCEPT_LANGUAGE_LIST lang)
-{
-
- if (key == NULL)
- return NULL;
-
- if (hres) {
- return PropertiesGetString(hres->propset, key, lang);
- }
-
- return NULL;
-}
-
-void core_res_destroy_resource(Resource *hres)
-{
- if (hres) {
- if (hres->path)
- free(hres->path);
- if (hres->package)
- free(hres->package);
- PropertiesDestroy(hres->propset);
-
- free(hres);
- }
-}
-
diff --git a/lib/libsi18n/coreres.h b/lib/libsi18n/coreres.h
deleted file mode 100644
index 8ad815a4..00000000
--- a/lib/libsi18n/coreres.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- *
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifndef CORERES_H
-#define CORERES_H
-
-#include "i18n.h"
-
-Resource* core_res_init_resource(const char* path, const char* package);
-const char *core_res_getstring(Resource *hres, char *key, ACCEPT_LANGUAGE_LIST lang);
-void core_res_destroy_resource(Resource *hres);
-
-#endif
diff --git a/lib/libsi18n/getlang.c b/lib/libsi18n/getlang.c
deleted file mode 100644
index f8cb649b..00000000
--- a/lib/libsi18n/getlang.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- *
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "libadmin/libadmin.h"
-
-
-#include "i18n.h"
-
-/*********************************************************************
- strReplace replaces the first instance of from in target with to.
- from can be "": to is inserted at start of target.
- to can be "": from is removed from target.
- if from is not found, 0 is returned; else 1 is returned.
- *********************************************************************/
-
-static int
-strReplace(char* target,char* from,char* to)
-{
- /* replace /from/to/ in target */
-
- char* pFrom;
- char* pOldTail;
- int lenTo;
-
- pFrom = strstr(target,from);
- if (pFrom) {
- pOldTail = pFrom+strlen(from);
- lenTo = strlen(to);
- memmove(pFrom+lenTo,pOldTail,strlen(pOldTail)+1);
- memcpy(pFrom,to,lenTo);
- return 1;
- }
-
- return 0;
-}
-
-/*********************************************************************
- statFileDir is a wrapper to stat() that strips trailing slashes
- because stat() on Windows seems to return -1 otherwise.
-*********************************************************************/
-
-int
-statFileDir(const char *path, struct stat *info) {
- int ret, pathlen;
- char *newpath = strdup(path);
-
- if(newpath == NULL)
- return -1;
-
- for (pathlen = (strlen(newpath) - 1); pathlen >= 0; pathlen--) {
- if (newpath[pathlen] == '/' || newpath[pathlen] == '\\') {
- newpath[pathlen] = '\0';
- } else {
- break;
- }
- }
-
- ret = stat(newpath, info);
-
- if (newpath)
- free(newpath);
-
- return ret;
-}
-
-/*********************************************************************
- GetLanguage is reserved for future use. These APIs are not belong
- to this file. It needs to be moved to somewhere which knows what's
- the current language setting.
- *********************************************************************/
-
-static char emptyString[] = "";
-
-static char client_language[128] = "en";
-static char admin_language[128] = "en";
-static char default_language[128] = "en";
-
-void
-SetLanguage(int type, char *language)
-{
- switch(type) {
- case CLIENT_LANGUAGE:
- if (language)
- strcpy(client_language, language);
- break;
- case ADMIN_LANGUAGE:
- if (language)
- strcpy(admin_language, language);
- break;
- case DEFAULT_LANGUAGE:
- if (language)
- strcpy(default_language, language);
- break;
- }
- return ;
-}
-
-
-
-char*
-GetClientLanguage(void)
-{
- if (client_language)
- return client_language;
- else
- return emptyString;
-}
-
-char*
-GetAdminLanguage(void)
-{
- if (admin_language)
- return admin_language;
- else
- return emptyString;
-}
-
-char*
-GetDefaultLanguage(void)
-{
- if (default_language)
- return default_language;
- else
- return "en";
-}
-
-/*********************************************************************
- GetFileForLanguage looks for a file in the appropriate language.
- *********************************************************************/
-
-NSAPI_PUBLIC
-int
-GetFileForLanguage(char* filePath,char* language,char* existingFilePath)
-{
- /* Input: filePath,language
- * filePath is of the form "/xxx/xxx/$$LANGDIR/xxx/xxx/filename"
- * or of the form "/xxx/xxx/xxx/xxx/filename".
- * filename may or may not have an extension.
- * language is an Accept-Language list; each language-range will be
- * tried as a subdirectory name and possibly as a filename modifier.
- * "*" is ignored - default always provided if needed.
- * "-" is replaced by "_".
- * $$LANGDIR is a special string replaced by language. It is optional.
- * For the default case, $$LANGDIR/ is replaced by nothing
- * (so // is not created).
- *
- * Returned: existingPath
- * existingFilePath is the path of a satisfactory, existing file.
- * if no file is found, an empty string "" is returned.
- *
- * int returned: -1 if no file found (existingFilePath = "")
- * 0 if default file is returned
- * 1 if language file is returned (any in list)
- *
- * Example:
- * filePath = "/path/$$LANGDIR/filename.ext"
- * language = "language"
- * GetDefaultLanguage() --> "default"
- * LANG_DELIMIT = "_"
- *
- * 1. Try: "/path/language/filename.ext"
- * 2. Try: "/path/filename_language.ext"
- * 3. Try: "/path/default/filename.ext"
- * 4. Try: "/path/filename_default.ext"
- * 5. Try: "/path/filename.ext"
- * else: ""
- *
- * Example:
- * language = "en-us;q=0.6,ja;q=0.8,en-ca"
- *
- * 1. Try: "/path/en-ca/filename.ext"
- * 2. Try: "/path/filename_en_ca.ext"
- * 3. Try: "/path/ja/filename.ext"
- * 4. Try: "/path/filename_ja.ext"
- * 5. Try: "/path/en_us/filename.ext"
- * 6. Try: "/path/filename_en_us.ext"
- * 7. Try: "/path/default/filename.ext"
- * 8. Try: "/path/filename_default.ext"
- * 9. Try: "/path/filename.ext"
- * else: ""
- *
- */
-
-#define LANG_DELIMIT '_'
-
- int pattern;
- char* pDot;
- char* pSlash;
-
- /* PRFileInfo info; */
- struct stat info;
-
- char lang_modifier[MAX_ACCEPT_LENGTH+1];
-
- ACCEPT_LANGUAGE_LIST acceptLanguageList;
- int numLang;
- int iLang;
- int iCase;
-
-
- /* escape in case XP_InitStringDatabase has not been called */
- if (filePath==NULL) {
- *existingFilePath = '\0';
- return -1;
- }
-
- pattern = (strstr(filePath,"$$LANGDIR/")!=NULL);
-
- for ( iCase=1 ; iCase>=0 ; iCase-- ) {
- if (iCase==1) { /* iCase=1 tries requested language */
- numLang = XP_AccLangList(language,acceptLanguageList);
- } else { /* iCase=0 tries default language */
- numLang = XP_AccLangList(GetDefaultLanguage(),acceptLanguageList);
- }
-
- for ( iLang=0 ; iLang<numLang ; iLang++ ) {
-
- /* Try: /path/language/filename.ext */
- if (pattern) {
- strcpy(existingFilePath,filePath);
- strReplace(existingFilePath,"$$LANGDIR",acceptLanguageList[iLang]);
-
- if (statFileDir(existingFilePath,&info)==0) {
- return iCase;
- }
-
- /*
- if (PR_GetFileInfo(existingFilePath,&info)==PR_SUCCESS) {
- return iCase;
- }
- */
- }
-
- /* Try: /path/filename_language.ext */
- {
- strcpy(existingFilePath,filePath);
- strReplace(existingFilePath,"$$LANGDIR/",emptyString);
- pDot = strrchr(existingFilePath,'.');
- pSlash = strrchr(existingFilePath,'/');
- if (pSlash>=pDot) {
- pDot = strchr(existingFilePath,'\0');
- }
- sprintf(lang_modifier,"%c%s",LANG_DELIMIT,acceptLanguageList[iLang]);
- strReplace(pDot,emptyString,lang_modifier);
-
- if (statFileDir(existingFilePath,&info)==0) {
- return iCase;
- }
-
- /*
- if (PR_GetFileInfo(existingFilePath,&info)==PR_SUCCESS) {
- return iCase;
- }
- */
- }
- }
- }
-
- /* Try: /path/filename.ext */
- {
- strcpy(existingFilePath,filePath);
- strReplace(existingFilePath,"$$LANGDIR/",emptyString);
-
- if (statFileDir(existingFilePath,&info)==0) {
- return 0;
- }
-
- /*
- if (PR_GetFileInfo(existingFilePath,&info)==PR_SUCCESS) {
- return 0;
- }
- */
- }
-
- /* Else: */
- *existingFilePath = '\0';
- return -1;
-}
-
-
-
-
-
-
diff --git a/lib/libsi18n/getstrmem.c b/lib/libsi18n/getstrmem.c
deleted file mode 100644
index 2beb3472..00000000
--- a/lib/libsi18n/getstrmem.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- *
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-
-#include <stdio.h>
-#include <string.h>
-
-#define COMPILE_STRINGS_IN_MEMORY
-
-static char emptyString[] = "";
-
-#ifdef COMPILE_STRINGS_IN_MEMORY
-
-typedef struct DATABIN {
- char* pLibraryName;
- char** pArrayOfLibraryStrings;
- unsigned numberOfStringsInLibrary;
- } DATABIN;
-
-#include "getstrmem.h"
-
-#endif
-
-#if 0 /* Example of getstrmem.h */
- /* It is intended that this header file be generated by program dblink */
-
- #define NUM_BUCKETS 2 /* must be power of 2 */
-
- /* strings in library libalpha */
- static char* libalpha[] = {
- "",
- "libalpha string 1",
- "libalpha string 2",
- "libalpha string 3",
- "libalpha string 4",
- emptyString };
-
- /* strings in library libbeta */
- static char* libbeta[] = {
- "",
- "libbeta string 1",
- "libbeta string 2",
- emptyString };
-
- /* libraries in bucket for hashKey==0 */
- static struct DATABIN bucket0[] = {
- {emptyString, NULL, 0}};
-
- /* libraries in bucket for hashKey==1 */
- static struct DATABIN bucket1[] = {
- {"libalpha", libalpha, 5},
- {"libbeta", libbeta, 3},
- {emptyString, NULL, 0}};
-
- /* array of buckets */
- static struct DATABIN* buckets[NUM_BUCKETS] = {
- bucket0,
- bucket1 };
-
-#endif /* end of example getstrmem.h */
-
-#define BUCKET_MASK NUM_BUCKETS-1
-
-char*
-XP_GetStringFromMemory(char* strLibraryName,int iToken)
-{
- /*
- * In memory model called by XP_GetStringFromDatabase
- * does not use database (nsres, et al.).
- *
- * This function uses hash table for library lookup
- * and direct lookup for string.
- *
- * This function is thread safe.
- */
-
-#ifdef COMPILE_STRINGS_IN_MEMORY
-
- unsigned hashKey;
- int found = 0;
- unsigned uToken = iToken;
- char* cPtr;
- DATABIN* pBucket;
-
- /* calculate hash key */
- hashKey = 0;
- cPtr = strLibraryName;
- while (*cPtr) {
- hashKey += *(cPtr++);
- }
- hashKey &= BUCKET_MASK;
-
- /* get bucket for this hash key */
- pBucket = buckets[hashKey];
-
- /* search overflow buckets */
- while (*(pBucket->pLibraryName)!='\0') {
- if (strcmp(pBucket->pLibraryName,strLibraryName)==0) {
- found = 1;
- break;
- }
- pBucket++;
- }
-
- if (!found) {
- return emptyString;
- }
-
- if (uToken<=pBucket->numberOfStringsInLibrary) {
- return pBucket->pArrayOfLibraryStrings[uToken];
- } else {
- /* string token out of range */
- return emptyString;
- }
-
-#else
-
- return emptyString;
-
-#endif
-}
diff --git a/lib/libsi18n/getstrprop.c b/lib/libsi18n/getstrprop.c
index 4a5ab04b..c63d6ba1 100644
--- a/lib/libsi18n/getstrprop.c
+++ b/lib/libsi18n/getstrprop.c
@@ -49,77 +49,7 @@
#include "getstrmem.h"
-#include "coreres.h"
-
-Resource *hResource = NULL;
-char empty_string[] = "";
-
-char*
-XP_GetStringFromMemory(char* strLibraryName,int iToken);
-
-
-
-void
-XP_InitStringDatabase(char* pathCWD, char* databaseName)
-{
- hResource = core_res_init_resource (pathCWD, databaseName);
-}
-
-char *XP_GetPropertyString(char* strLibraryName,int iToken, ACCEPT_LANGUAGE_LIST lang)
-{
- char *key_name;
- char *result = NULL;
-
- if (hResource == NULL)
- return NULL;
-
- /*creating the key*/
- key_name=(char*)malloc(strlen(strLibraryName) + 10);
- sprintf(key_name, "%s-%d", strLibraryName, iToken);
- if(key_name == NULL)
- return NULL;
-
- result = (char *) core_res_getstring(hResource, key_name, lang) ;
-
- if (key_name)
- free (key_name);
-
- if (result == NULL)
- return empty_string;
- else
- return result ;
-}
-
-char*
-XP_GetStringFromDatabase(char* strLibraryName,
- char* strLanguage,
- int key)
-{
- char *result = NULL;
- ACCEPT_LANGUAGE_LIST alanglist;
- int n;
-
- /*
- * display first choice language if available, otherwise
- * use default which is english in most case
- */
- if (hResource) {
- n = XP_AccLangList (strLanguage, alanglist);
- if (n >= MAX_ACCEPT_LANGUAGE)
- alanglist[MAX_ACCEPT_LANGUAGE-1][0] = '\0';
- else
- alanglist[n][0] = '\0';
- result = XP_GetPropertyString(strLibraryName, key, alanglist);
- }
-
- /* we should never come here. */
- if (result == NULL)
- result = XP_GetStringFromMemory(strLibraryName,key);
- return result;
-}
-
-
-char*
+static char*
XP_GetStringFromMemory(char* strLibraryName,int iToken)
{
/*
@@ -171,3 +101,16 @@ XP_GetStringFromMemory(char* strLibraryName,int iToken)
}
}
+
+char*
+XP_GetStringFromDatabase(char* strLibraryName,
+ char* strLanguage,
+ int key)
+{
+ char *result = NULL;
+
+ /* we use memory strings only in ds. */
+ if (result == NULL)
+ result = XP_GetStringFromMemory(strLibraryName,key);
+ return result;
+}
diff --git a/lib/libsi18n/propset.c b/lib/libsi18n/propset.c
deleted file mode 100644
index 87b98854..00000000
--- a/lib/libsi18n/propset.c
+++ /dev/null
@@ -1,442 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- *
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include "i18n.h"
-
-#include "txtfile.h"
-#include "reshash.h"
-#include "propset.h"
-
-int PropertiesLoadFileToHash(PropertiesSet *propset, char *language);
-char *GetProertiesFilename(char *directory, char *file, char *language);
-int PropertiesLanguageStatus(PropertiesSet *propset, char *language);
-int PropertiesSetLangStatus(LanguageStatus *langstatus, char *language, int status);
-int unicode_to_UTF8(unsigned int wch, char *utf8);
-char *decode_ascii(char *src);
-
-
-PropertiesSet * PropertiesInit(char *directory, char *file)
-{
- struct stat buf;
- char * file_path;
- PropertiesSet *propset = NULL;
- PropertiesSet *result = NULL;
- ResHash *reshash;
-
- file_path = (char *) malloc (strlen(directory) + strlen(file) + 20);
-
- strcpy(file_path, directory);
- strcat(file_path, "/");
- strcat(file_path, file);
- strcat(file_path, ".properties");
-
- if (stat(file_path, &buf) == 0) {
- propset = (PropertiesSet *) malloc(sizeof(PropertiesSet));
- memset(propset, 0, sizeof(PropertiesSet));
- reshash = (ResHash *) ResHashCreate(file);
-
- if (reshash) {
- propset->langlist = (LanguageStatus *) malloc(sizeof(LanguageStatus));
- memset(propset->langlist, 0, sizeof(LanguageStatus));
-
- propset->res = reshash;
- propset->directory = strdup(directory);
- propset->filename = strdup(file);
- PropertiesLoadFileToHash(propset, NULL);
- result = propset;
- }
- }
-
- if (file_path)
- free (file_path);
-
- return result;
-}
-
-
-char *GetProertiesFilename(char *directory, char *file, char *language)
-{
- char *filepath;
-
- if (language && *language == '\0')
- filepath = (char *) malloc(strlen(directory) + strlen(file) + strlen(language) + 20);
- else
- filepath = (char *) malloc(strlen(directory) + strlen(file) + 20);
-
- strcpy(filepath, directory);
- if (filepath[strlen(filepath) - 1] != '/')
- strcat(filepath, "/");
- strcat(filepath, file);
- if (language && *language != '\0') {
- strcat(filepath, "_");
- strcat(filepath, language);
- }
- strcat(filepath, ".properties");
-
- return filepath;
-}
-
-/*
- PropertiesLoadToHash
-
- Opens property file and save data to hash table
-
- Input
- propfile: handle
- file: full path with file extension
-
- return:
- 0: SUCCESS
- 1: FAIL
-*/
-
-int PropertiesLoadFileToHash(PropertiesSet *propset, char *language)
-{
- TEXTFILE *hfile;
- char *filepath;
- char *p, *q;
- int n;
- char linebuf[1000];
- int st;
-
- st = PropertiesLanguageStatus(propset, language);
- if (st == LANGUAGE_INVALID)
- return 1;
- else if (st == LANGUAGE_LOAD)
- return 0;
-
- filepath = GetProertiesFilename(propset->directory, propset->filename, language);
-
- if ((hfile = OpenTextFile (filepath, TEXT_OPEN_FOR_READ)) == NULL) {
- PropertiesSetLangStatus(propset->langlist, language, LANGUAGE_INVALID);
- return 1;
- }
-
- while ((n = ReadTextLine(hfile, linebuf)) >= 0) {
- if (n == 0)
- continue;
-
- p = linebuf;
- /* strip leading spaces */
- while (*p == ' ' || *p == '\t')
- p ++;
- /* skip comment line */
- if (*p == '\0' || *p == '#' || *p == '=')
- continue;
-
- q = strchr (linebuf, '=');
- if (q) {
- char *key, *value, *newvalue;
-
- *q = '\0';
- key = p;
- value = q + 1;
- /* strip trailing space for key */
- p = key + strlen(key) - 1;
- while (*p == ' ' || *p == '\t') {
- *p = '\0';
- p --;
- }
-
- /* decode Unicode escape value */
- newvalue = decode_ascii(value);
-
- if (newvalue) {
- ResHashAdd(propset->res, key, newvalue, language);
- free(newvalue);
- }
- else
- ResHashAdd(propset->res, key, value, language);
- }
- }
- PropertiesSetLangStatus(propset->langlist, language, LANGUAGE_LOAD);
- return 0;
-}
-
-/*
- PropertiesIsLoaded
-
- Test if current properties associated with language
- is loaded or not.
-
- return:
- 1: SUCCESS
- 0: FAIL
- */
-
-int PropertiesLanguageStatus(PropertiesSet *propset, char *language)
-{
- LanguageStatus *plang;
-
- plang = propset->langlist;
- if (language == NULL || *language == '\0') {
- return plang->status;
- }
-
- plang = plang->next;
-
- while (plang) {
- if (strcmp(plang->language, language) == 0) {
- return plang->status;
- }
- plang = plang->next;
- }
- return LANGUAGE_NONE;
-}
-
-int PropertiesSetLangStatus(LanguageStatus *langlist, char *language, int status)
-{
- LanguageStatus *plang, *prev;
- LanguageStatus *langstatus;
-
- if (language == NULL || *language == '\0') {
- langlist->status = status;
- return 0;
- }
-
- prev = plang = langlist;
- plang = plang->next;
-
- while (plang) {
- if (strcmp(plang->language, language) == 0) {
- plang->status = status;
- return 0;
- }
- prev = plang;
- plang = plang->next;
- }
-
- langstatus = (LanguageStatus *) malloc(sizeof(LanguageStatus));
- memset (langstatus, 0, sizeof(LanguageStatus));
- langstatus->language = strdup(language);
- langstatus->status = status;
- prev->next = langstatus;
-
- return 0;
-}
-
-
-/***
- PropertiesOpenFile
-
- return 0: loaded
- 1: fail to load file associated with the language
-
-
- */
-int PropertiesOpenFile(PropertiesSet *propset, char *language)
-{
- int status;
- status = PropertiesLanguageStatus(propset, language);
-
- if (status == LANGUAGE_NONE)
- return PropertiesLoadFileToHash (propset, language);
- else if (status == LANGUAGE_INVALID)
- return 1;
- else
- return 0;
-}
-
-const char *PropertiesGetString(PropertiesSet *propset, char *key, ACCEPT_LANGUAGE_LIST acceptlangauge)
-{
- int i;
- char *language = NULL;
-
- i = 0;
- while (acceptlangauge[i][0]) {
- if (PropertiesOpenFile(propset, acceptlangauge[i]) == 0) {
- language = acceptlangauge[i];
- break;
- }
- i ++;
- }
-
- return ResHashSearch(propset->res, key, language);
-}
-void PropertiesDestroy(PropertiesSet *propset)
-{
- LanguageStatus *langattrib, *next;
-
- if (propset) {
- if (propset->path)
- free(propset->path);
- if (propset->directory)
- free(propset->directory);
- if (propset->filename)
- free(propset->filename);
-
- ResHashDestroy(propset->res);
-
- langattrib = propset->langlist;
- while (langattrib) {
- next = langattrib->next;
- if (langattrib->language)
- free(langattrib->language);
- free(langattrib);
- langattrib = next;
- }
- }
-}
-
-
-char *decode_ascii(char *src)
-{
- int i;
- char utf8[10];
- int state = 0;
- int digit = 0;
- int digit_count = 0;
- char *result, *p, *q;
-
- if (src == NULL || *src == '\0')
- return NULL;
-
- if (strchr(src, '\\') == NULL)
- return NULL;
-
- result = (char *) malloc(strlen(src) + 1);
-
- p = src;
- q = result;
-
- for (;*p; p++) {
- char ch;
- int n;
- if (state == BACKSLASH_U) {
- ch = toupper(*p);
- if (ch >= '0' && ch <= '9') {
- digit = digit * 16 + (ch - '0');
- digit_count ++;
- }
- else if (ch >= 'A' && ch <= 'F') {
- digit = digit * 16 + (ch - 'A' + 10);
- digit_count ++;
- }
- else {
- n = unicode_to_UTF8(digit, utf8);
- for (i = 0; i < n; i++)
- *q ++ = utf8[i];
- *q ++ = *p;
- state = 0;
- digit_count = 0;
- }
-
- if (digit_count == 4) {
- n = unicode_to_UTF8(digit, utf8);
- for (i = 0; i < n; i++)
- *q ++ = utf8[i];
- state = 0;
- }
- }
- else if (state == BACKSLASH) {
- if (*p == 'u') {
- state = BACKSLASH_U;
- digit = 0;
- digit_count = 0;
- continue;
- }
- else if (*p == 'n') {
- *q++ = '\n';
- state = 0;
- }
- else if (*p == 'r') {
- *q++ = '\r';
- state = 0;
- }
- else {
- *q++ = '\\';
- *q++ = *p;
- state = 0;
- }
- }
- else if (*p == '\\') {
- state = BACKSLASH;
- continue;
- }
- else {
- *q++ = *p;
- state = 0;
- }
- }
- *q = '\0';
- return result;
-}
-
-
-int unicode_to_UTF8(unsigned int wch, char *utf8)
-{
- unsigned char hibyte, lobyte, mibyte;
-
- if (wch <= 0x7F) {
- /* 0000 007F ==> 0xxxxxxx */
- utf8[0] = (unsigned char) wch ;
- utf8[1] = '\0';
- return 1;
- }
- else if (wch <= 0x7FF) {
- /* 0000 07FF ==> 110xxxxx 10xxxxxx */
- lobyte = wch & 0x3F;
- hibyte = (wch >> 6) & 0x1F;
-
- utf8[0] = 0xC0 | hibyte;
- utf8[1] = 0x80 | lobyte;
- utf8[2] = '\0';
- return 2;
- }
- else {
- /* FFFF ==> 1110xxxx 10xxxxxx 10xxxxxx */
- lobyte = wch & 0x3F;
- mibyte = (wch >> 6) & 0x3F;
- hibyte = (wch >> 12) & 0xF;
-
- utf8[0] = 0xE0 | hibyte;
- utf8[1] = 0x80 | mibyte;
- utf8[2] = 0x80 | lobyte;
- utf8[3] = '\0';
- return 3;
- }
-}
diff --git a/lib/libsi18n/propset.h b/lib/libsi18n/propset.h
deleted file mode 100644
index 8ef0df96..00000000
--- a/lib/libsi18n/propset.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- *
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifndef PROPSET_H
-#define PROPSET_H
-
-#include "reshash.h"
-
-
-enum {
- LANGUAGE_NONE = 0,
- LANGUAGE_LOAD,
- LANGUAGE_INVALID
-} ;
-
-enum {
- BACKSLASH = 1,
- BACKSLASH_U
-};
-
-
-typedef struct LanguageStatusS {
- char *language;
- int status;
- struct LanguageStatusS *next;
-} LanguageStatus;
-
-typedef struct PropertiesSet {
- char *path;
- char *directory;
- char *filename;
- LanguageStatus *langlist;
- ResHash *res;
-} PropertiesSet;
-
-
-PropertiesSet * PropertiesInit(char *directory, char *file);
-const char *PropertiesGetString(PropertiesSet *propset, char *key, ACCEPT_LANGUAGE_LIST acceptlangauge);
-void PropertiesDestroy(PropertiesSet *propfile);
-
-#endif
generated by cgit (git 2.34.1) at 2024-06-24 20:27:58 +0000