summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Haferkamp <rhafer@suse.de>2011-12-21 14:16:36 +0100
committerRalf Haferkamp <rhafer@suse.de>2012-01-17 12:31:03 +0100
commit3d08211972e295291284bcc46462ec7c4e05dc60 (patch)
treef9a858ccee9888e16fcb6a333c66d3bc3714cd0c
parent45c62a8e86bbd35a50fefe33248b01f6482982a8 (diff)
Fix LDAP Schema Syntax (bug 904380)
Apply the change from commit 8741597f62 to the .schema file as well (additional fix for bug 904380) Change-Id: Ifd7e7de235b9c81c746cdc64ce699073697c8bb0
-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 )
)