Update with latest from -devel.

[openldap] / servers / ldapd / modify.c

diff --git a/servers/ldapd/modify.c b/servers/ldapd/modify.c
index bbfd5ed82aa9725d6374cebd2052c5c8cb7fcc0a..dd4538c034a0af8f3bd1631dfcdba37e601b2fb7 100644 (file)
--- a/servers/ldapd/modify.c
+++ b/servers/ldapd/modify.c
@@ -10,16 +10,21 @@
  * is provided ``as is'' without express or implied warranty.
  */
 
+#include "portable.h"
+
 #include <stdio.h>
-#include <ctype.h>
+
+#include <ac/ctype.h>
+#include <ac/socket.h>
+#include <ac/string.h>         /* get SAFEMEMCPY */
+
 #include <quipu/commonarg.h>
 #include <quipu/attrvalue.h>
 #include <quipu/ds_error.h>
 #include <quipu/modify.h>
 #include <quipu/dap2.h>
 #include <quipu/dua.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
 #include "lber.h"
 #include "ldap.h"
 #include "common.h"
@@ -38,8 +43,9 @@ extern short  ldap_rts_cred_syntax;
 extern short   ldap_rtl_syntax;
 extern short   ldap_octetstring_syntax;
 
+static int replace_mod( struct entrymod *, Attr_Sequence, Attr_Sequence );
 
-#ifdef COMPAT20
+#ifdef LDAP_COMPAT20
 extern int     ldap_compat;
 #define MODTAG (ldap_compat == 20 ? OLD_LDAP_RES_MODIFY : LDAP_RES_MODIFY)
 #else
@@ -517,7 +523,7 @@ modlist_free( LDAPMod *mods )
  * that are not in the new set and by only adding what isn't in old set
  */
 
-int
+static int
 replace_mod(
     struct entrymod    *rem,
     Attr_Sequence      oas,