From 1634811465c9cbf37207c59f74703c377a4363e1 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 7 Apr 2004 01:11:32 +0000
Subject: [PATCH] Use BER_BVNULL

---
 libraries/libldap/cyrus.c  | 2 +-
 libraries/libldap/dnssrv.c | 2 +-
 libraries/libldap/ftest.c  | 3 ++-
 libraries/libldap/getdn.c  | 4 ++--
 libraries/libldap/passwd.c | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 6b3c4c0285..f80a4c33c5 100644
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -621,7 +621,7 @@ ldap_int_sasl_bind(
 	/* Check for TLS */
 	ssl = ldap_pvt_tls_sb_ctx( ld->ld_sb );
 	if ( ssl ) {
-		struct berval authid = { 0, NULL };
+		struct berval authid = BER_BVNULL;
 		ber_len_t fac;
 
 		fac = ldap_pvt_tls_get_strength( ssl );
diff --git a/libraries/libldap/dnssrv.c b/libraries/libldap/dnssrv.c
index 66d977bd99..637cd61299 100644
--- a/libraries/libldap/dnssrv.c
+++ b/libraries/libldap/dnssrv.c
@@ -46,7 +46,7 @@ int ldap_dn2domain(
 	LDAPDN dn = NULL;
 	LDAPRDN rdn = NULL;
 	LDAPAVA *ava = NULL;
-	struct berval domain = { 0, NULL };
+	struct berval domain = BER_BVNULL;
 	static const struct berval DC = BER_BVC("DC");
 	static const struct berval DCOID = BER_BVC("0.9.2342.19200300.100.1.25");
 
diff --git a/libraries/libldap/ftest.c b/libraries/libldap/ftest.c
index f8f96a5f30..7b2df874d1 100644
--- a/libraries/libldap/ftest.c
+++ b/libraries/libldap/ftest.c
@@ -25,6 +25,7 @@
 #include <ldap.h>
 
 #include "ldap_pvt.h"
+#include "lber_pvt.h"
 
 #include "ldif.h"
 #include "lutil.h"
@@ -85,7 +86,7 @@ main( int argc, char *argv[] )
 static int filter2ber( char *filter )
 {
 	int rc;
-	struct berval bv = {0, NULL};
+	struct berval bv = BER_BVNULL;
 	BerElement *ber;
 
 	printf( "Filter: %s\n", filter );
diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c
index e14342db77..af3b8f0da8 100644
--- a/libraries/libldap/getdn.c
+++ b/libraries/libldap/getdn.c
@@ -955,8 +955,8 @@ ldap_bv2rdn_x( struct berval *bv, LDAPRDN *rdn,
 	int		attrTypeEncoding = LDAP_AVA_STRING, 
 			attrValueEncoding = LDAP_AVA_STRING;
 
-	struct berval	attrType = { 0, NULL };
-	struct berval 	attrValue = { 0, NULL };
+	struct berval	attrType = BER_BVNULL;
+	struct berval 	attrValue = BER_BVNULL;
 
 	LDAPRDN		newRDN = NULL;
 	LDAPAVA		*tmpRDN_[TMP_AVA_SLOTS], **tmpRDN = tmpRDN_;
diff --git a/libraries/libldap/passwd.c b/libraries/libldap/passwd.c
index 57428292c8..d6e2dd1d2f 100644
--- a/libraries/libldap/passwd.c
+++ b/libraries/libldap/passwd.c
@@ -85,7 +85,7 @@ ldap_passwd( LDAP *ld,
 	int				*msgidp )
 {
 	int rc;
-	struct berval bv = {0, NULL};
+	struct berval bv = BER_BVNULL;
 	BerElement *ber = NULL;
 
 	assert( ld != NULL );
-- 
2.39.5