From 2c07200a3a90e7c743319707904dab3cc10f9cc6 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 6 Dec 2001 07:32:53 +0000
Subject: [PATCH] pretty DNs
---
servers/slapd/schema_init.c | 2 +-
tests/data/acl.out.master | 2 +-
tests/data/slapd-acl.conf | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index e6653a673e..72f12fec52 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -4596,7 +4596,7 @@ struct syntax_defs_rec syntax_defs[] = {
{"( 1.3.6.1.4.1.1466.115.121.1.11 DESC 'Country String' )",
0, countryStringValidate, IA5StringNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.12 DESC 'Distinguished Name' )",
- 0, dnValidate, dnNormalize, NULL},
+ 0, dnValidate, dnNormalize, dnPretty},
{"( 1.3.6.1.4.1.1466.115.121.1.13 DESC 'Data Quality' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.14 DESC 'Delivery Method' )",
diff --git a/tests/data/acl.out.master b/tests/data/acl.out.master
index 4d9b4e6c7e..546c3eb92f 100644
--- a/tests/data/acl.out.master
+++ b/tests/data/acl.out.master
@@ -32,7 +32,7 @@ member: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michiga
member: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Mic
higan,c=US
member: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Univ
-ersity of Michigan,c=US
+ ersity of Michigan,c=US
member: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Mich
igan,c=US
member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mic
diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index e6e4ebecbd..70c17492c3 100644
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -20,9 +20,9 @@ access to * by * read
database @BACKEND@
cachesize 0
-suffix "o=University of Michigan, c=US"
+suffix "o=University of Michigan,c=US"
directory ./test-db
-rootdn "cn=Manager, o=University of Michigan, c=US"
+rootdn "cn=Manager,o=University of Michigan,c=US"
rootpw secret
#ldbm#index objectClass eq
#ldbm#index cn,sn,uid pres,eq,sub
@@ -42,9 +42,9 @@ access to filter="objectclass=person" attr=userpassword
by anonymous auth
by self write
-access to dn.children="ou=Alumni Association, ou=People, o=University of Michigan, c=US"
+access to dn.children="ou=Alumni Association,ou=People,o=University of Michigan,c=US"
by dn.regex=".+,o=University of Michigan,c=US" +c continue
- by dn.subtree="o=University of Michigan, c=US" +rs continue
+ by dn.subtree="o=University of Michigan,c=US" +rs continue
by * stop
access to attr=member
@@ -52,7 +52,7 @@ access to attr=member
by * read
access to filter="objectclass=groupofnames"
- by dn.base="cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan,c=US" =sc continue
+ by dn.base="cn=Bjorn Jensen,ou=Information Technology Division,ou=People, o=University of Michigan,c=US" =sc continue
by dn="^cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US$" +rw stop
by * break
--
GitLab