ITS#10436 Fix sometimes uninitialised variables

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 6a5a481157fa35b334402b66f7e6a84f25966beb..80f6ffab02a2f364fecab8b89991faa62dbe8bde 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -2016,7 +2016,7 @@ meta_send_entry(
        Entry                   ent = { 0 };
        BerElement              ber = *ldap_get_message_ber( e );
        Attribute               *attr, **attrp;
-       LDAPControl **res_ctrls;
+       LDAPControl **res_ctrls = NULL;
        struct berval           bdn,
                                dn = BER_BVNULL;
        const char              *text;

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 07e1c0d2e32eb9f01970abcaa12d2ef2e3c6eff8..28c99b101b09ef83488ed0092363d94b8b35c5e0 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -1504,7 +1504,6 @@ out:
 int slap_sasl_regexp_config( const char *match, const char *replace, int valx )
 {
        int i, rc;
-       SaslRegexp_t sr;
        struct rewrite_info *rw = NULL;
 
        if ( valx < 0 || valx > nSaslRegexp )
@@ -1529,7 +1528,6 @@ int slap_sasl_regexp_config( const char *match, const char *replace, int valx )
                        SaslRegexp[i] = SaslRegexp[i - 1];
                }
 
-               SaslRegexp[i] = sr;
                SaslRegexp[i].sr_match = ch_strdup( match );
                SaslRegexp[i].sr_replace = ch_strdup( replace );