summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-20 02:01:51 +0000
committerGerrit Code Review <review@openstack.org>2012-01-20 02:01:51 +0000
commit50b22cbf912747d89bbc487b20a67d4b2232d55c (patch)
treeb8b27c177e207a9e3c12f8975ce406a8a4f0dc2e
parent31f7770add8c7fc2979295cf97bb10be8b3a00c1 (diff)
parent3d08211972e295291284bcc46462ec7c4e05dc60 (diff)
Merge "Fix LDAP Schema Syntax (bug 904380)"
-rw-r--r--keystone/backends/ldap/keystone.schema6
1 files changed, 2 insertions, 4 deletions
diff --git a/keystone/backends/ldap/keystone.schema b/keystone/backends/ldap/keystone.schema
index 77471ef3..68f0d562 100644
--- a/keystone/backends/ldap/keystone.schema
+++ b/keystone/backends/ldap/keystone.schema
@@ -51,8 +51,7 @@ objectClass (
NAME 'keystoneUser'
SUP top
AUXILIARY
- MUST ( keystoneName )
- MUST ( keystoneEnabled )
+ MUST ( keystoneName $ keystoneEnabled )
MAY ( mail $ userPassword )
)
@@ -70,8 +69,7 @@ objectClass (
NAME 'keystoneTenant'
SUP top
AUXILIARY
- MUST ( keystoneName )
- MUST ( keystoneEnabled )
+ MUST ( keystoneName $ keystoneEnabled )
MAY ( member $ description )
)