Introduce BaseBaseDN which is the real base dn

diff --git a/debian/changelog b/debian/changelog
index 6feea47..901ef21 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,12 +14,14 @@ userdir-ldap (0.3.XXX) UNRELEASED; urgency=low
       but instead re-use the domain from email-append.
     - now preserve server side modifcation times when rsyncing data.
   * userdir_ldap.py: read auth password from environment if set.
+  * Introduce BaseBaseDN which is the real base dn.  BaseDN itself
+    has historically been used as the root of the user tree.
 
   [ Stephen Gran ]
   * Fix deprecation warnings for sha module by using hashlib module instead
   * ud-fingerserv: update Net::LDAP import
 
- -- Peter Palfrader <weasel@debian.org>  Mon, 05 Mar 2012 11:17:36 +0100
+ -- Peter Palfrader <weasel@debian.org>  Mon, 05 Mar 2012 11:27:32 +0100
 
 userdir-ldap (0.3.79) unstable; urgency=low
 

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 3c45fe3..5b66fd0 100644 (file)
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -10,6 +10,7 @@ localsyncon = "*draghi*";
 ldaphost = "db.debian.org";
 usessl   = True;
 basedn   = "ou=users,dc=debian,dc=org";
+basebasedn = "dc=debian,dc=org";
 hostbasedn = "ou=hosts,dc=debian,dc=org";
 adminuser = "admin";
 

diff --git a/userdir_ldap.py b/userdir_ldap.py
index 9972136..b0d06b5 100644 (file)
--- a/userdir_ldap.py
+++ b/userdir_ldap.py
@@ -52,6 +52,11 @@ try:
 except AttributeError:
    UseSSL = False;
 
+try:
+   BaseBaseDn = ConfModule.basebasedn;
+except AttributeError:
+   BaseBaseDn = BaseDn
+
 # Break up the keyring list
 userdir_gpg.SetKeyrings(ConfModule.keyrings.split(":"))