From 0a1f7bb5d8e336ae05466715d4f3fba34997c9f5 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 15 Sep 2008 01:12:41 +0200 Subject: [PATCH] Reading the hmac key only once is too troublesome --- debian/changelog | 6 ++++++ userdir_ldap.py | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index f4eec4b..ee4b953 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +userdir-ldap (0.3.40) unstable; urgency=low + + * Reading the hmac key only once is too troublesome. + + -- Peter Palfrader Mon, 15 Sep 2008 01:12:23 +0200 + userdir-ldap (0.3.39) unstable; urgency=low * Lowercasing hashed sudo passwords in ud-mailgate not considered smart. diff --git a/userdir_ldap.py b/userdir_ldap.py index 1bc9dbb..e6c628d 100644 --- a/userdir_ldap.py +++ b/userdir_ldap.py @@ -43,10 +43,6 @@ 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 = File.readline().strip() -File.close(); - # For backwards compatibility, we default to the old behaviour MultipleSSHFiles = getattr(ConfModule, 'multiplesshfiles', False) SingleSSHFile = getattr(ConfModule, 'singlesshfile', True) @@ -458,6 +454,9 @@ def Group2GID(l, name): return -1 def make_hmac(str): + File = open(PassDir+"/key-hmac-"+pwd.getpwuid(os.getuid())[0],"r"); + HmacKey = File.readline().strip() + File.close(); return hmac.new(HmacKey, str, sha1_module).hexdigest() def make_sudopasswd_hmac(purpose, uuid, hosts, cryptedpass): -- 2.20.1