ITS#6230 fix typos

[openldap] / servers / slapd / back-relay / back-relay.h

diff --git a/servers/slapd/back-relay/back-relay.h b/servers/slapd/back-relay/back-relay.h
index 9e447a7448ba17c6935f1036beee959f8be614c0..691f8708b03c033922096fe74c2b2b001bc46476 100644 (file)
--- a/servers/slapd/back-relay/back-relay.h
+++ b/servers/slapd/back-relay/back-relay.h
@@ -1,7 +1,8 @@
 /* back-relay.h - relay backend header file */
+/* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004 The OpenLDAP Foundation.
+ * Copyright 2004-2009 The OpenLDAP Foundation.
  * Portions Copyright 2004 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -21,18 +22,30 @@
 #ifndef SLAPD_RELAY_H
 #define SLAPD_RELAY_H
 
-#include "external.h"
+#include "proto-back-relay.h"
 
 /* String rewrite library */
 
 LDAP_BEGIN_DECL
 
+typedef enum relay_operation_e {
+       relay_op_entry_get = op_last,
+       relay_op_entry_release,
+       relay_op_has_subordinates,
+       relay_op_last
+} relay_operation_t;
+
 typedef struct relay_back_info {
        BackendDB       *ri_bd;
        struct berval   ri_realsuffix;
        int             ri_massage;
 } relay_back_info;
 
+/* Pad relay_back_info if needed to create valid OpExtra key addresses */
+#define        RELAY_INFO_SIZE \
+       (sizeof(relay_back_info) > (size_t) relay_op_last ? \
+        sizeof(relay_back_info) : (size_t) relay_op_last   )
+
 LDAP_END_DECL
 
 #endif /* SLAPD_RELAY_H */