Sync with HEAD

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 08ddfda50f913cacdc873e450f6a35f8f99784e0..3beff2f438b98456e69d391222fa9f33bcce505b 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -223,8 +223,8 @@ send_ldap_response(
        Operation *op,
        SlapReply *rs )
 {
-       char berbuf[LBER_ELEMENT_SIZEOF];
-       BerElement      *ber = (BerElement *)berbuf;
+       BerElementBuffer berbuf;
+       BerElement      *ber = (BerElement *) &berbuf;
        int             rc;
        long    bytes;
 
@@ -602,8 +602,8 @@ slap_send_ldap_intermediate( Operation *op, SlapReply *rs )
 int
 slap_send_search_entry( Operation *op, SlapReply *rs )
 {
-       char berbuf[LBER_ELEMENT_SIZEOF];
-       BerElement      *ber = (BerElement *)berbuf;
+       BerElementBuffer berbuf;
+       BerElement      *ber = (BerElement *) &berbuf;
        Attribute       *a, *aa;
        int             i, j, rc=-1, bytes;
        char            *edn;
@@ -1193,8 +1193,8 @@ error_return:;
 int
 slap_send_search_reference( Operation *op, SlapReply *rs )
 {
-       char berbuf[LBER_ELEMENT_SIZEOF];
-       BerElement      *ber = (BerElement *)berbuf;
+       BerElementBuffer berbuf;
+       BerElement      *ber = (BerElement *) &berbuf;
        int rc = 0;
        int bytes;
        void *mark;
@@ -1437,8 +1437,8 @@ int slap_read_controls(
 {
        int rc;
        struct berval bv;
-       char berbuf[LBER_ELEMENT_SIZEOF];
-       BerElement *ber = (BerElement *) berbuf;
+       BerElementBuffer berbuf;
+       BerElement *ber = (BerElement *) &berbuf;
        LDAPControl c;
        ber_len_t       siz, len;
        Operation myop;