summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-12-19 13:42:45 +0000
committerGerrit Code Review <review@openstack.org>2011-12-19 13:42:45 +0000
commitafe1c3236296ebd792e91ae9ec6df519bcf78190 (patch)
tree50a043ab439171053f249162136094fcb53cf66c
parent197ae2df5fd78c3a48c560ef9ac647e2205f5874 (diff)
parent8741597f624177e5172140054f27e60b6b376b26 (diff)
Merge "LDAP: fix to keystone.ldif"
-rw-r--r--keystone/backends/ldap/keystone.ldif6
1 files changed, 2 insertions, 4 deletions
diff --git a/keystone/backends/ldap/keystone.ldif b/keystone/backends/ldap/keystone.ldif
index a288d5c0..f8ac417a 100644
--- a/keystone/backends/ldap/keystone.ldif
+++ b/keystone/backends/ldap/keystone.ldif
@@ -46,8 +46,7 @@ olcObjectClasses: (
NAME 'keystoneUser'
SUP top
AUXILIARY
- MUST ( keystoneName )
- MUST ( keystoneEnabled )
+ MUST ( keystoneName $ keystoneEnabled )
MAY ( mail $ userPassword )
)
olcObjectClasses: (
@@ -62,8 +61,7 @@ olcObjectClasses: (
NAME 'keystoneTenant'
SUP top
AUXILIARY
- MUST ( keystoneName )
- MUST ( keystoneEnabled )
+ MUST ( keystoneName $ keystoneEnabled )
MAY ( member $ description )
)
olcObjectClasses: (