ITS#9343 ppolicy: Fix require_password parsing in slapd.conf

diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index 9a3144517f9464afd38e14a28093d275cecf568f..9bc2c5d65036a55f66dcbf4be1bd148e21256779 100644 (file)
--- a/servers/slapd/overlays/ppolicy.c
+++ b/servers/slapd/overlays/ppolicy.c
@@ -972,11 +972,10 @@ ppolicy_rule_parse( policy_rule **prp, ConfigArgs *c )
                                goto done;
                        }
 
-                       if ( !strcasecmp(c->argv[1], "true") ||
-                                       !strcasecmp(c->argv[1], "yes") ) {
+                       if ( !strcasecmp(value, "true") || !strcasecmp(value, "yes") ) {
                                pr->require_password = 1;
-                       } else if ( !strcasecmp(c->argv[1], "false") ||
-                                       !strcasecmp(c->argv[1], "no") ) {
+                       } else if ( !strcasecmp(value, "false") ||
+                                       !strcasecmp(value, "no") ) {
                                pr->require_password = 0;
                        } else {
                                snprintf( c->cr_msg, sizeof( c->cr_msg ),

diff --git a/tests/data/slapd-ppolicy.conf b/tests/data/slapd-ppolicy.conf
index a133c6195f58ee2e0b8b7e9d85b03ae162acce37..dbf3ec0937211744586985687b8853cbd86f7647 100644 (file)
--- a/tests/data/slapd-ppolicy.conf
+++ b/tests/data/slapd-ppolicy.conf
@@ -42,7 +42,7 @@ ppolicy_rules dn.regex="uid=([^,]*),ou=people,(dc=example,dc=com)"
     group/groupOfNames/member.expand="cn=Test Group,ou=Groups,$2"
     policy_dn.expand="cn=$1 policy,ou=Policies,dc=example,dc=com"
 ppolicy_rules dn.baseObject="uid=ndadmin,ou=People,dc=example,dc=com" no_policy
-ppolicy_rules filter="(description=idle)"
+ppolicy_rules require_password=yes filter="(description=idle)"
     policy_dn="cn=Idle Expiration Policy, ou=Policies, dc=example, dc=com"
 ppolicy_default        "cn=Standard Policy,ou=Policies,dc=example,dc=com"
 ppolicy_use_lockout