diff options
author | David Boreham <dboreham@redhat.com> | 2005-05-20 03:57:34 +0000 |
---|---|---|
committer | David Boreham <dboreham@redhat.com> | 2005-05-20 03:57:34 +0000 |
commit | ed6016fcb396737cfbc9e3ed4b82932a7a018d1d (patch) | |
tree | 12aeabfd8b383ec367e280aa514615448789bc87 | |
parent | 74b4ecce3f521cbb0c26a57b37e4a72f96a48d04 (diff) | |
download | ds-ed6016fcb396737cfbc9e3ed4b82932a7a018d1d.tar.gz ds-ed6016fcb396737cfbc9e3ed4b82932a7a018d1d.tar.xz ds-ed6016fcb396737cfbc9e3ed4b82932a7a018d1d.zip |
Fix for #158253: add attributes to the exclusion list for fractional replication. Add an error string returned to clients if an illegal attribute is configured
-rw-r--r-- | ldap/servers/plugins/replication/repl5_agmt.c | 1 | ||||
-rw-r--r-- | ldap/servers/plugins/replication/repl5_agmtlist.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c index 26f19d02..d73fbf50 100644 --- a/ldap/servers/plugins/replication/repl5_agmt.c +++ b/ldap/servers/plugins/replication/repl5_agmt.c @@ -1166,6 +1166,7 @@ agmt_validate_replicated_attributes(Repl_Agmt *ra) "nsuniqueid", "modifiersname", "lastmodifiedtime", + "dc", "o", "ou", "cn", "objectclass", NULL }; diff --git a/ldap/servers/plugins/replication/repl5_agmtlist.c b/ldap/servers/plugins/replication/repl5_agmtlist.c index 2206f83d..9afe486b 100644 --- a/ldap/servers/plugins/replication/repl5_agmtlist.c +++ b/ldap/servers/plugins/replication/repl5_agmtlist.c @@ -409,6 +409,7 @@ agmtlist_modify_callback(Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry if (denied_attrs) { /* Report the error to the client */ + PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "attempt to exclude an illegal attribute in a fractional agreement"); slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "agmtlist_modify_callback: " "attempt to exclude an illegal attribute in a fractional agreement\n"); |