X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir_ldap.py;h=1bc9dbbe060c548c1d3d4ac7b6f96e60c782888e;hb=187d3edfdc561cd4a929811d63f73114e15932e8;hp=5e87deb083d7970dd797387a6bc52625e3da7af8;hpb=f5a604b09785a04336b4caa4ea09d7e1cb744b54;p=mirror%2Fuserdir-ldap.git diff --git a/userdir_ldap.py b/userdir_ldap.py index 5e87deb..1bc9dbb 100644 --- a/userdir_ldap.py +++ b/userdir_ldap.py @@ -17,8 +17,10 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # Some routines and configuration that are used by the ldap progams -import termios, re, imp, ldap, sys, crypt, rfc822, pwd; +import termios, re, imp, ldap, sys, crypt, rfc822, pwd, os; import userdir_gpg +import hmac +import sha as sha1_module try: File = open("/etc/userdir-ldap/userdir-ldap.conf"); @@ -42,7 +44,7 @@ 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() +HmacKey = File.readline().strip() File.close(); # For backwards compatibility, we default to the old behaviour