ITS#5569

diff --git a/CHANGES b/CHANGES
index 9b98c825f4f8b2a7de3a08da0b49e390310af73f..a316d287b90017ebf8335cc441a4d0478844130b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,7 @@ OpenLDAP 2.4.11 Engineering
        Added slapo-nssov contrib module
        Fixed slapo-pcache handling of negative search caches (ITS#5546)
        Fixed slapo-ppolicy DNs with whitespaces (ITS#5552)
+       Fixed slapo-ppolicy modify with internal ops (ITS#5569)
        Fixed slapo-syncprov ACL evaluation (ITS#5548)
        Fixed slapo-syncprov crash with delcsn (ITS#5589)
        Fixed slapo-syncprov full reload (ITS#5564)

diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index 8fc7b33b13a94e2f0e4e8a9a888b7f8f01013c6b..160358a9646aadcab27b864f6059c584e38ef088 100644 (file)
--- a/servers/slapd/overlays/ppolicy.c
+++ b/servers/slapd/overlays/ppolicy.c
@@ -1581,7 +1581,7 @@ ppolicy_modify( Operation *op, SlapReply *rs )
                                }
                        }
 
-               } else if ( !is_at_operational( ml->sml_desc->ad_type ) ) {
+               } else if ( !(ml->sml_flags & SLAP_MOD_INTERNAL) && !is_at_operational( ml->sml_desc->ad_type ) ) {
                        mod_pw_only = 0;
                        /* modifying something other than password */
                }