Fix ldap_rename parameter order (ITS#387)

[openldap] / libraries / libldap / charset.c

diff --git a/libraries/libldap/charset.c b/libraries/libldap/charset.c
index be85707a833e97fa3c79699b710817fc8ff66ba1..1f348dc2093bf514f755ebbdbd4cdf6791c6d81b 100644 (file)
--- a/libraries/libldap/charset.c
+++ b/libraries/libldap/charset.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -17,13 +18,11 @@
 
 #include <ac/stdlib.h>
 
+#include <ac/param.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
 
 #include "ldap-int.h"
 
@@ -40,7 +39,7 @@ ldap_set_string_translators( LDAP *ld, BERTranslateProc encode_proc,
 void
 ldap_enable_translation( LDAP *ld, LDAPMessage *entry, int enable )
 {
-       short   *optionsp;
+       unsigned short  *optionsp;
 
        optionsp = ( entry == NULL ) ? &ld->ld_lberoptions :
            &entry->lm_ber->ber_options;