Additional changes suggested by Hallvard

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 64abc4c3945d7e11874e627176e01b9e76d3acc9..65b54874f25d22e9f2bfeabffb0d703093652df1 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -664,6 +664,7 @@ parse_acl(
 
                                                        snprintf( buf, sizeof( buf ), "%s: line %d: "
                                                                " attr \"%s\" normalization failed (%d: %s)",
+                                                               fname, lineno,
                                                                a->acl_attrs[ 0 ].an_name.bv_val, rc, text );
                                                        Debug( LDAP_DEBUG_ANY, "%s: line %d: %s.\n",
                                                                fname, lineno, buf );

diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index 64d58e1541c04132032f7a00eb01b82a54291591..4b5726aa8745fe8af9c0474e61cc25e54b896617 100644 (file)
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -398,7 +398,7 @@ replog1(
                                                                fprintf( fp, "%s: %s\n", did, type );
                                                                first = 0;
                                                        }
-                                                       vals[0] = a->a_nvals[i];
+                                                       vals[0] = ml->sml_values[i];
                                                        print_vals( fp, &ml->sml_desc->ad_cname, vals );
                                                        ocs = 2;
                                                }