Change LDAP.ld_lberoptions to `short', to realign with BerElement.ber_options

diff --git a/libraries/libldap/charset.c b/libraries/libldap/charset.c
index a3618923b149b4a1d901987ef4e9e3fbba8a9cb3..5a324ed2df7c6e09777caf1b148c4cdfed0bb31a 100644 (file)
--- a/libraries/libldap/charset.c
+++ b/libraries/libldap/charset.c
@@ -39,7 +39,7 @@ ldap_set_string_translators( LDAP *ld, BERTranslateProc encode_proc,
 void
 ldap_enable_translation( LDAP *ld, LDAPMessage *entry, int enable )
 {
-       char    *optionsp;
+       short   *optionsp;
 
        optionsp = ( entry == NULLMSG ) ? &ld->ld_lberoptions :
            &entry->lm_ber->ber_options;

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 9f27a0a6a347086c52114095720f0fe6ba06170a..7cae7d94dc3863277ac85d6c7e0240eb52997776 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -205,7 +205,7 @@ struct ldap {
        char    *ld_host;
        int             ld_port;
 
-       char    ld_lberoptions;
+       short           ld_lberoptions;
 
        LDAPFiltDesc    *ld_filtd;      /* from getfilter for ufn searches */
        char            *ld_ufnprefix;  /* for incomplete ufn's */