From e7e9ca95a5068b952ddff88989c5b48ab439e5bd Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 2 Dec 2003 04:27:43 +0000
Subject: [PATCH] Use BerElementBuffer

---
 servers/slapd/back-bdb/search.c | 24 ++++++++++++------------
 servers/slapd/passwd.c          |  8 ++++----
 servers/slapd/result.c          | 12 ++++++------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index e9b9760b33..b65c01b749 100644
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -1143,8 +1143,8 @@ send_pagerequest_response(
 	int		tentries )
 {
 	LDAPControl	ctrl, *ctrls[2];
-	char berbuf[LBER_ELEMENT_SIZEOF];
-	BerElement	*ber = (BerElement *)berbuf;
+	BerElementBuffer berbuf;
+	BerElement	*ber = (BerElement *)&berbuf;
 	struct berval	cookie = { 0, NULL };
 	PagedResultsCookie respcookie;
 
@@ -1209,8 +1209,8 @@ bdb_build_lcup_update_ctrl(
 	int rc;
 	const char *text = NULL;
 
-	char berbuf[LBER_ELEMENT_SIZEOF];
-	BerElement *ber = (BerElement *)berbuf;
+	BerElementBuffer berbuf;
+	BerElement	*ber = (BerElement *)&berbuf;
 
 	struct berval entrycsn_bv = { 0, NULL };
 
@@ -1299,8 +1299,8 @@ bdb_build_lcup_done_ctrl(
 	struct berval	*latest_entrycsn_bv	)
 {
 	int ret, rc;
-	char berbuf[LBER_ELEMENT_SIZEOF];
-	BerElement *ber = (BerElement *)berbuf;
+	BerElementBuffer berbuf;
+	BerElement	*ber = (BerElement *)&berbuf;
 
 	ber_init2( ber, NULL, LBER_USE_DER );
 
@@ -1350,8 +1350,8 @@ bdb_build_sync_state_ctrl(
 	int rc;
 	const char *text = NULL;
 
-	char berbuf[LBER_ELEMENT_SIZEOF];
-	BerElement *ber = (BerElement *)berbuf;
+	BerElementBuffer berbuf;
+	BerElement	*ber = (BerElement *)&berbuf;
 
 	struct berval entryuuid_bv	= { 0, NULL };
 	struct berval entrycsn_bv	= { 0, NULL };
@@ -1438,8 +1438,8 @@ bdb_build_sync_done_ctrl(
 	struct berval	*latest_entrycsn_bv	)
 {
 	int ret,rc;
-	char berbuf[LBER_ELEMENT_SIZEOF];
-	BerElement *ber = (BerElement *)berbuf;
+	BerElementBuffer berbuf;
+	BerElement	*ber = (BerElement *)&berbuf;
 
 	ber_init2( ber, NULL, LBER_USE_DER );
 
@@ -1486,8 +1486,8 @@ bdb_send_ldap_intermediate(
 	struct berval *cookie,
 	LDAPControl **ctrls	)
 {
-	char berbuf[LBER_ELEMENT_SIZEOF];
-	BerElement *ber = (BerElement *)berbuf;
+	BerElementBuffer berbuf;
+	BerElement	*ber = (BerElement *)&berbuf;
 	struct berval rspdata;
 
 	int ret, rc;
diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index cdbec06d05..b3505ca519 100644
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -98,8 +98,8 @@ int slap_passwd_parse( struct berval *reqdata,
 	int rc = LDAP_SUCCESS;
 	ber_tag_t tag;
 	ber_len_t len;
-	char berbuf[LBER_ELEMENT_SIZEOF];
-	BerElement *ber = (BerElement *)berbuf;
+	BerElementBuffer berbuf;
+	BerElement *ber = (BerElement *) &berbuf;
 
 	if( reqdata == NULL ) {
 		return LDAP_SUCCESS;
@@ -239,9 +239,9 @@ struct berval * slap_passwd_return(
 {
 	int rc;
 	struct berval *bv = NULL;
-	char berbuf[LBER_ELEMENT_SIZEOF];
+	BerElementBuffer berbuf;
 	/* opaque structure, size unknown but smaller than berbuf */
-	BerElement *ber = (BerElement *)berbuf;
+	BerElement *ber = (BerElement *) &berbuf;
 
 	assert( cred != NULL );
 
diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 2e412aeb5f..d10cb5f13f 100644
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -234,8 +234,8 @@ send_ldap_response(
 	LDAPControl **ctrls
 )
 {
-	char berbuf[LBER_ELEMENT_SIZEOF];
-	BerElement	*ber = (BerElement *)berbuf;
+	BerElementBuffer berbuf;
+	BerElement	*ber = (BerElement *)&berbuf;
 	int		rc;
 	long	bytes;
 
@@ -717,8 +717,8 @@ slap_send_search_entry(
 	LDAPControl **ctrls
 )
 {
-	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;
@@ -1341,8 +1341,8 @@ slap_send_search_reference(
     BerVarray *v2refs
 )
 {
-	char berbuf[LBER_ELEMENT_SIZEOF];
-	BerElement	*ber = (BerElement *)berbuf;
+	BerElementBuffer berbuf;
+	BerElement	*ber = (BerElement *)&berbuf;
 	int rc;
 	int bytes;
 
-- 
2.39.5