Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / include / slapi-plugin.h

diff --git a/include/slapi-plugin.h b/include/slapi-plugin.h
index a59e7a9d3f4515716ce2122b8ad9ddb2565f98da..691c3b2527b5463d3249a0fdb96147c3fb6fed51 100644 (file)
--- a/include/slapi-plugin.h
+++ b/include/slapi-plugin.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * Portions Copyright 1997,2002,2003 IBM Corporation.
  * All rights reserved.
  *
@@ -31,9 +31,9 @@ typedef struct slapi_attr             Slapi_Attr;
 typedef struct slapi_value             Slapi_Value;
 typedef struct slapi_valueset          Slapi_ValueSet;
 typedef struct slapi_filter            Slapi_Filter;
-typedef struct slap_backend_db         Slapi_Backend;
-typedef struct slap_op                 Slapi_Operation;
-typedef struct slap_conn               Slapi_Connection;
+typedef struct BackendDB               Slapi_Backend;
+typedef struct Operation               Slapi_Operation;
+typedef struct Connection              Slapi_Connection;
 typedef struct slapi_dn                        Slapi_DN;
 typedef struct slapi_rdn               Slapi_RDN;
 typedef struct slapi_mod               Slapi_Mod;
@@ -399,6 +399,8 @@ void slapi_seq_internal_set_pb( Slapi_PBlock *pb, char *ibase, int type,
 /* connection related routines */
 int slapi_is_connection_ssl(Slapi_PBlock *pPB, int *isSSL);
 int slapi_get_client_port(Slapi_PBlock *pPB, int *fromPort);
+int slapi_get_client_ip(Slapi_PBlock *pb, char **clientIP);
+void slapi_free_client_ip(char **clientIP);
 
 /* computed attributes */
 typedef struct _computed_attr_context computed_attr_context;
@@ -528,7 +530,8 @@ int slapi_x_backend_get_flags( const Slapi_Backend *be, unsigned long *flags );
 #define SLAPI_X_CONN_SSF                       1303
 #define SLAPI_X_CONN_SASL_CONTEXT              1304
 #define SLAPI_X_OPERATION_DELETE_GLUE_PARENT   1305
-#define SLAPI_X_MANAGEDIT                      1306
+#define SLAPI_X_RELAX                  1306
+#define SLAPI_X_MANAGEDIT                      SLAPI_X_RELAX
 #define SLAPI_X_OPERATION_NO_SCHEMA_CHECK      1307
 #define SLAPI_X_ADD_STRUCTURAL_CLASS           1308
 #define SLAPI_X_OPERATION_NO_SUBORDINATE_GLUE  1309