[Da-tools-commits] ./debian/userdir-ldap r455: Fix order of some calls so stuff works again

[Peter Palfrader]

------------------------------------------------------------
revno: 455
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Mon 2008-09-15 00:12:11 +0200
message:
  Fix order of some calls so stuff works again
modified:
  debian/changelog
  userdir_ldap.py
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-09-14 21:45:53 +0000
+++ b/debian/changelog	2008-09-14 22:12:11 +0000
@@ -1,3 +1,9 @@
+userdir-ldap (0.3.38) unstable; urgency=low
+
+  * Fix order of some calls so stuff works again.
+
+ -- Peter Palfrader <weasel at 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

=== modified file 'userdir_ldap.py'
--- a/userdir_ldap.py	2008-09-14 19:20:14 +0000
+++ b/userdir_ldap.py	2008-09-14 22:12:11 +0000
@@ -27,10 +27,6 @@
 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 @@
 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)