X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir_ldap.py;fp=userdir_ldap.py;h=16dfbdb6678607b036957dc9e0b6b8dede6780e4;hb=828ae85d71bf905074508d1a80c88c72d44e1fbf;hp=0eb4c13bbdb33ee65da5f19f3b3bf818abe09a73;hpb=549746403f1893e188019f712a465439f4679fa0;p=mirror%2Fuserdir-ldap.git 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)