Comment 1 for bug 980209

Revision history for this message
Adam Young (ayoung) wrote :

The fix is
[ayoung@ayoung ldap]$ git show
commit f9238e29a3e83989b98dde62597156aafa1e68a0
Author: Adam Young <email address hidden>
Date: Thu Apr 12 15:19:54 2012 -0400

    Correct Tree DN

diff --git a/keystone/common/ldap/core.py b/keystone/common/ldap/core.py
index 72647c2..43a33d7 100644
--- a/keystone/common/ldap/core.py
+++ b/keystone/common/ldap/core.py
@@ -83,7 +83,7 @@ class BaseLdap(object):
                 self.suffix = self.DEFAULT_SUFFIX
             dn = '%s_tree_dn' % self.options_name
             self.tree_dn = (getattr(conf.ldap, dn)
- or '%s,%s' % (self.suffix, self.DEFAULT_OU))
+ or '%s,%s' % (self.DEFAULT_OU, self.suffix))

             idatt = '%s_id_attribute' % self.options_name
             self.id_attr = getattr(conf.ldap, idatt) or self.DEFAULT_ID_ATTR