mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-18 11:05:48 +08:00
Sync with HEAD
This commit is contained in:
parent
16065f9947
commit
9a0a0ee23a
@ -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 );
|
||||
|
@ -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");
|
||||
|
||||
|
@ -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 );
|
||||
|
@ -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_;
|
||||
|
@ -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 );
|
||||
|
Loading…
Reference in New Issue
Block a user