cleanup

diff --git a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
index 88448f1f33152f07d7cdb3c84bea8f7e92b519a8..f5feab29361a8da5cb42329807a2cbebcb347847 100644 (file)
--- 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 8ddd2155c41862a57e5043707584c5e0ecb3d1c2..510a4bba98ccbe0ca3d9a5d7f4fac3dd9204e32a 100644 (file)
--- 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 b985aa9650a8dd49e776f290845ad43577f323d6..d022538f5958e2c12cf1ffbc06681e5e6c9fb00f 100644 (file)
--- 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;