Sync with HEAD

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 6b3c4c0285c3c0cb2d01dcce9940e45318fb85a8..f80a4c33c591bc4a520ef69ca5920df9b64a9f6c 100644 (file)
--- 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 66d977bd99c0910e8a53f696ba22899413bb384c..637cd61299c085752b3c0638d8f5deedd708670e 100644 (file)
--- 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 f8f96a5f30999b86cc6b343e916bb384faa21347..7b2df874d1e02cf3799a200acab2c89f6c322d7e 100644 (file)
--- 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 e14342db77ca8f68c9cfaa89386c3dadb69946b7..af3b8f0da8a4c57ad3ee3017ab60fbeb3efeeff8 100644 (file)
--- 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 57428292c8e667bfd234b6bcaa08c6a8d8c2b6a0..d6e2dd1d2f981d92a6893f63f3b63f10573d5cb3 100644 (file)
--- 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 );