per LDAPext discussion, delete pwdAccountLockedTime on password change

[openldap] / servers / slapd / overlays / accesslog.c

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index cdac2f7801614dff93ff5af2a211660fdd58de56..0470d0d1bd228676f767d957052d1275599927b0 100644 (file)
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -146,7 +146,10 @@ static AttributeDescription *ad_reqDN, *ad_reqStart, *ad_reqEnd, *ad_reqType,
        *ad_reqNewSuperior, *ad_reqDeleteOldRDN, *ad_reqMod,
        *ad_reqScope, *ad_reqFilter, *ad_reqAttr, *ad_reqEntries,
        *ad_reqSizeLimit, *ad_reqTimeLimit, *ad_reqAttrsOnly, *ad_reqData,
-       *ad_reqId, *ad_reqMessage, *ad_oldest;
+       *ad_reqId, *ad_reqMessage;
+#if 0
+static AttributeDescription *ad_oldest;
+#endif
 
 static struct {
        char *at;
@@ -342,7 +345,6 @@ static struct {
 static int
 log_age_parse(char *agestr)
 {
-       char *ptr;
        int t1, t2;
        int gotdays = 0;
 
@@ -419,7 +421,7 @@ log_age_unparse( int age, struct berval *agebv )
        agebv->bv_len = ptr - agebv->bv_val;
 }
 
-static slap_callback nullsc = { NULL, slap_null_cb, NULL, NULL };
+static slap_callback nullsc = { NULL, NULL, NULL, NULL };
 
 #define PURGE_INCREMENT        100
 
@@ -842,7 +844,7 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
                                vals[i].bv_len = m->sml_desc->ad_cname.bv_len + 2;
                                vals[i].bv_val = ch_malloc( vals[i].bv_len+1 );
                                ptr = lutil_strcopy( vals[i].bv_val,
-                                       a->a_desc->ad_cname.bv_val );
+                                       m->sml_desc->ad_cname.bv_val );
                                *ptr++ = ':';
                                *ptr++ = '-';
                                *ptr = '\0';
@@ -1061,6 +1063,8 @@ int accesslog_init()
 
        accesslog.on_bi.bi_cf_ocs = log_cfocs;
 
+       nullsc.sc_response = slap_null_cb;
+
        rc = config_register_schema( log_cfats, log_cfocs );
        if ( rc ) return rc;