From: Howard Chu Date: Fri, 26 Aug 2005 00:19:08 +0000 (+0000) Subject: Leave pwdPolicySubEntry user-modifiable for now X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~573 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d7122627fafa7af777ba03368b6dd73e433b0c6b;p=openldap Leave pwdPolicySubEntry user-modifiable for now --- diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c index 115529014b..006631cb8a 100644 --- a/servers/slapd/overlays/ppolicy.c +++ b/servers/slapd/overlays/ppolicy.c @@ -155,7 +155,12 @@ static struct schema_info { "DESC 'The pwdPolicy subentry in effect for this object' " "EQUALITY distinguishedNameMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 " - "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )", + "SINGLE-VALUE " +#if 0 + /* Not until MANAGEDIT control is released */ + "NO-USER-MODIFICATION " +#endif + "USAGE directoryOperation )", &ad_pwdPolicySubentry }, { NULL, NULL } }; diff --git a/tests/scripts/test022-ppolicy b/tests/scripts/test022-ppolicy index f78e257cd1..e1aac0c336 100755 --- a/tests/scripts/test022-ppolicy +++ b/tests/scripts/test022-ppolicy @@ -54,7 +54,8 @@ if test $RC != 0 ; then fi echo "Using ldapadd to populate the database..." -$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD -e manageDIT < \ +# may need -e manageDIT for draft 09, but not yet. +$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \ $LDIFPPOLICY > $TESTOUT 2>&1 RC=$? if test $RC != 0 ; then