limit checking in syncrepl

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index dc056040b4e47f1c4277b7da0ba74cdae4aebe52..27ec820fac32f2215de249a76bf0c04c7a1f5bb9 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,7 @@
 #include "slap.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 static ldap_pvt_thread_mutex_t slap_op_mutex;
@@ -93,7 +93,7 @@ slap_op_free( Operation *op )
                GroupAssertion *g, *n;
                for (g = op->o_groups; g; g=n) {
                        n = g->ga_next;
-                       sl_free(g, op->o_tmpmemctx);
+                       slap_sl_free(g, op->o_tmpmemctx);
                }
                op->o_groups = NULL;
        }
@@ -101,7 +101,7 @@ slap_op_free( Operation *op )
 #if defined( LDAP_SLAPI )
        if ( op->o_pb != NULL ) {
                slapi_pblock_destroy( (Slapi_PBlock *)op->o_pb );
-               slapi_x_free_object_extensions( SLAPI_X_EXT_OPERATION, op );
+               slapi_int_free_object_extensions( SLAPI_X_EXT_OPERATION, op );
        }
 #endif /* defined( LDAP_SLAPI ) */
 
@@ -157,7 +157,7 @@ slap_op_alloc(
 #if defined( LDAP_SLAPI )
        if ( slapi_plugins_used ) {
                op->o_pb = slapi_pblock_new();
-               slapi_x_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
+               slapi_int_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
        }
 #endif /* defined( LDAP_SLAPI ) */