From 754e59543d6cae2596319fd2ebb4a6efa52db47e Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sun, 20 Nov 2005 01:39:19 +0000 Subject: [PATCH] cleanup --- contrib/slapd-modules/smbk5pwd/smbk5pwd.c | 2 +- servers/slapd/back-ldap/search.c | 1 - servers/slapd/sasl.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c index 88448f1f33..f5feab2936 100644 --- a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c +++ b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c @@ -864,7 +864,7 @@ static int smbk5pwd_db_init(BackendDB *be) { slap_overinst *on = (slap_overinst *)be->bd_info; - smbk5pwd_t *pi; + smbk5pwd_t *pi; pi = ch_calloc( 1, sizeof( smbk5pwd_t ) ); if ( pi == NULL ) { diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c index 8ddd2155c4..510a4bba98 100644 --- a/servers/slapd/back-ldap/search.c +++ b/servers/slapd/back-ldap/search.c @@ -216,7 +216,6 @@ retry: op->ors_slimit, &msgid ); if ( rs->sr_err != LDAP_SUCCESS ) { -fail:; switch ( rs->sr_err ) { case LDAP_SERVER_DOWN: if ( do_retry ) { diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c index b985aa9650..d022538f59 100644 --- a/servers/slapd/sasl.c +++ b/servers/slapd/sasl.c @@ -542,7 +542,7 @@ slap_sasl_canonicalize( { Connection *conn = (Connection *)context; struct propctx *props = sasl_auxprop_getctx( sconn ); - struct propval auxvals[ SLAP_SASL_PROP_COUNT ] = { 0 }; + struct propval auxvals[ SLAP_SASL_PROP_COUNT ] = { { 0 } }; struct berval dn; int rc, which; const char *names[2]; @@ -658,7 +658,7 @@ slap_sasl_authorize( * (SLAP_SASL_PROP_COUNT - 1) because we skip "conn", * + 1 for NULL termination? */ - struct propval auxvals[ SLAP_SASL_PROP_COUNT ] = { 0 }; + struct propval auxvals[ SLAP_SASL_PROP_COUNT ] = { { 0 } }; struct berval authcDN, authzDN = BER_BVNULL; int rc; -- 2.39.5