From daf4186849b2536dc8bc7d6e08013d63396414a8 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Wed, 21 Apr 2004 22:49:04 +0000 Subject: [PATCH] improve ITS#3107 --- tests/data/test-limits.ldif | 12 +++--------- tests/scripts/test022-ppolicy | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/tests/data/test-limits.ldif b/tests/data/test-limits.ldif index 40a6fee647..4833f8be2c 100644 --- a/tests/data/test-limits.ldif +++ b/tests/data/test-limits.ldif @@ -6,17 +6,11 @@ objectclass: organization objectclass: domainRelatedObject objectclass: dcobject dc: example -l: Ann Arbor, Michigan +l: Anytown, Michigan st: Michigan o: Example, Inc. -o: University of Michigan -o: UMICH -o: UM -o: U-M -o: U of M -description: The University of Michigan at Ann Arbor -postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US +description: Some example company at Anytown in Michigan +postaladdress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US telephonenumber: +1 313 764-1817 associateddomain: example.com diff --git a/tests/scripts/test022-ppolicy b/tests/scripts/test022-ppolicy index bf391fa7d1..02576b5e39 100755 --- a/tests/scripts/test022-ppolicy +++ b/tests/scripts/test022-ppolicy @@ -33,7 +33,7 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" -USER="uid=nd, ou=People, o=University of Michigan, c=US" +USER="uid=nd, ou=People, dc=example, dc=com" PASS=testpassword echo "Using ldapsearch to check that slapd is running..." @@ -94,7 +94,7 @@ fi echo "Testing password expiration..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \ $TESTOUT 2>&1 << EOMODS -dn: uid=nd, ou=People, o=University of Michigan, c=US +dn: uid=nd, dc=example, dc=com changetype: modify replace: pwdChangedTime pwdChangedTime: 20031231000001Z @@ -136,7 +136,7 @@ fi echo "Filling password history..." $LDAPMODIFY -v -D "$USER" -h $LOCALHOST -p $PORT1 -w $PASS > \ $TESTOUT 2>&1 << EOMODS -dn: uid=nd, ou=People, o=University of Michigan,c=US +dn: uid=nd, ou=People, dc=example, dc=com changetype: modify delete: userpassword userpassword: testpassword @@ -144,7 +144,7 @@ userpassword: testpassword replace: userpassword userpassword: 20urgle12-1 -dn: uid=nd, ou=People, o=University of Michigan,c=US +dn: uid=nd, ou=People, dc=example, dc=com changetype: modify delete: userpassword userpassword: 20urgle12-1 @@ -152,7 +152,7 @@ userpassword: 20urgle12-1 replace: userpassword userpassword: 20urgle12-2 -dn: uid=nd, ou=People, o=University of Michigan,c=US +dn: uid=nd, ou=People, dc=example, dc=com changetype: modify delete: userpassword userpassword: 20urgle12-2 @@ -160,7 +160,7 @@ userpassword: 20urgle12-2 replace: userpassword userpassword: 20urgle12-3 -dn: uid=nd, ou=People, o=University of Michigan,c=US +dn: uid=nd, ou=People, dc=example, dc=com changetype: modify delete: userpassword userpassword: 20urgle12-3 @@ -168,7 +168,7 @@ userpassword: 20urgle12-3 replace: userpassword userpassword: 20urgle12-4 -dn: uid=nd, ou=People, o=University of Michigan,c=US +dn: uid=nd, ou=People, dc=example, dc=com changetype: modify delete: userpassword userpassword: 20urgle12-4 @@ -176,7 +176,7 @@ userpassword: 20urgle12-4 replace: userpassword userpassword: 20urgle12-5 -dn: uid=nd, ou=People, o=University of Michigan,c=US +dn: uid=nd, ou=People, dc=example, dc=com changetype: modify delete: userpassword userpassword: 20urgle12-5 @@ -194,7 +194,7 @@ fi echo "Testing password history..." $LDAPMODIFY -v -D "$USER" -h $LOCALHOST -p $PORT1 -w 20urgle12-6 > \ $TESTOUT 2>&1 << EOMODS -dn: uid=nd, ou=People, o=University of Michigan, c=US +dn: uid=nd, ou=People, dc=example, dc=com changetype: modify delete: userPassword userPassword: 20urgle12-6 @@ -214,7 +214,7 @@ echo "Testing forced reset..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \ $TESTOUT 2>&1 << EOMODS -dn: uid=nd, ou=People, o=University of Michigan, c=US +dn: uid=nd, ou=People, dc=example, dc=com changetype: modify replace: userPassword userPassword: testpassword @@ -250,7 +250,7 @@ echo "Clearing forced reset..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \ $TESTOUT 2>&1 << EOMODS -dn: uid=nd, ou=People, o=University of Michigan, c=US +dn: uid=nd, ou=People, dc=example, dc=com changetype: modify delete: pwdReset -- 2.39.5