upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-03 05:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9671 Revert some NO-USER-MODIFICATION flags in ppolicy

Browse source
This commit is contained in:
Ondřej Kuzník 2021-09-16 10:36:20 +01:00 committed by Quanah Gibson-Mount
parent f8bc0913cf
commit 77dfb204c1
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/man/man5/slapo-ppolicy.5
View file

@ -790,7 +790,6 @@ policy rules will be enforced.
EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
SINGLE\-VALUE
NO\-USER\-MODIFICATION
USAGE directoryOperation)
.RE
@ -835,7 +834,6 @@ password policy attribute is set to "TRUE".
EQUALITY generalizedTimeMatch
ORDERING generalizedTimeOrderingMatch
SINGLE\-VALUE
NO\-USER\-MODIFICATION
USAGE directoryOperation)
.RE
@ -991,7 +989,6 @@ applies.
ORDERING generalizedTimeOrderingMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
SINGLE\-VALUE
NO\-USER\-MODIFICATION
USAGE directoryOperation )
.RE
@ -1010,7 +1007,6 @@ attribute does not exist, then this restriction does not apply.
ORDERING generalizedTimeOrderingMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
SINGLE\-VALUE
NO\-USER\-MODIFICATION
USAGE directoryOperation )
.RE

6
servers/slapd/overlays/ppolicy.c
View file

@ -161,7 +161,9 @@ static struct schema_info {
"ORDERING generalizedTimeOrderingMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 "
"SINGLE-VALUE "
#if 0 /* FIXME: ITS#9671 until we introduce a separate lockout flag? */
"NO-USER-MODIFICATION "
#endif
"USAGE directoryOperation )",
&ad_pwdAccountLockedTime },
{ "( 1.3.6.1.4.1.42.2.27.8.1.19 "
@ -203,7 +205,9 @@ static struct schema_info {
"EQUALITY distinguishedNameMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "
"SINGLE-VALUE "
#if 0 /* ITS#9671: until we implement ITS#9343 or similar */
"NO-USER-MODIFICATION "
#endif
"USAGE directoryOperation )",
&ad_pwdPolicySubentry },
{ "( 1.3.6.1.4.1.42.2.27.8.1.27 "
@ -213,7 +217,6 @@ static struct schema_info {
"ORDERING generalizedTimeOrderingMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 "
"SINGLE-VALUE "
"NO-USER-MODIFICATION "
"USAGE directoryOperation )",
&ad_pwdStartTime },
{ "( 1.3.6.1.4.1.42.2.27.8.1.28 "
@ -223,7 +226,6 @@ static struct schema_info {
"ORDERING generalizedTimeOrderingMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 "
"SINGLE-VALUE "
"NO-USER-MODIFICATION "
"USAGE directoryOperation )",
&ad_pwdEndTime },
/* Defined in schema_prep.c now

2
tests/scripts/test022-ppolicy
View file

@ -78,7 +78,7 @@ if test $RC = 0 ; then
fi
echo "Using ldapadd to populate the database..."
$LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD -e '!relax' \
$LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD \
< $LDIFPPOLICY >> $TESTOUT 2>&1
RC=$?
if test $RC != 0 ; then