From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 14 Sep 2008 22:12:11 +0000 (+0200)
Subject: Fix order of some calls so stuff works again
X-Git-Tag: userdir-ldap-0.3.38
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=828ae85d71bf905074508d1a80c88c72d44e1fbf

Fix order of some calls so stuff works again
---

diff --git a/debian/changelog b/debian/changelog
index 782c5c3..68e732f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+userdir-ldap (0.3.38) unstable; urgency=low
+
+  * Fix order of some calls so stuff works again.
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 15 Sep 2008 00:11:57 +0200
+
 userdir-ldap (0.3.37) unstable; urgency=low
 
   * ud-mailgate: Do not commit any changes if one of the requests is invalid
diff --git a/userdir_ldap.py b/userdir_ldap.py
index 0eb4c13..16dfbdb 100644
--- a/userdir_ldap.py
+++ b/userdir_ldap.py
@@ -27,10 +27,6 @@ except:
 ConfModule = imp.load_source("userdir_config","/etc/userdir-ldap.conf",File);
 File.close();
 
-File = open(PassDir+"/key-hmac-"+pwd.getpwuid(os.getuid())[0],"r");
-HmacKey = F.readline().strip()
-File.close();
-
 # Cheap hack
 BaseDn = ConfModule.basedn;
 HostBaseDn = ConfModule.hostbasedn;
@@ -45,6 +41,10 @@ PassDir = ConfModule.passdir;
 Ech_ErrorLog = ConfModule.ech_errorlog;
 Ech_MainLog = ConfModule.ech_mainlog;
 
+File = open(PassDir+"/key-hmac-"+pwd.getpwuid(os.getuid())[0],"r");
+HmacKey = F.readline().strip()
+File.close();
+
 # For backwards compatibility, we default to the old behaviour
 MultipleSSHFiles = getattr(ConfModule, 'multiplesshfiles', False)
 SingleSSHFile = getattr(ConfModule, 'singlesshfile', True)