X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir_ldap.py;h=3a43f4fddef4558e8d0bb3655a7b29066043f54d;hb=4f471180cc08e40c19d907892fc2102c43fecd49;hp=1bc9dbbe060c548c1d3d4ac7b6f96e60c782888e;hpb=187d3edfdc561cd4a929811d63f73114e15932e8;p=mirror%2Fuserdir-ldap.git diff --git a/userdir_ldap.py b/userdir_ldap.py index 1bc9dbb..3a43f4f 100644 --- a/userdir_ldap.py +++ b/userdir_ldap.py @@ -1,6 +1,7 @@ # Copyright (c) 1999-2000 Jason Gunthorpe # Copyright (c) 2001-2003 Ryan Murray # Copyright (c) 2004-2005 Joey Schulze +# Copyright (c) 2008 Peter Palfrader # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,14 +43,7 @@ TemplatesDir = ConfModule.templatesdir; 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) +HostDomain = getattr(ConfModule, "hostdomain", EmailAppend) try: UseSSL = ConfModule.usessl; @@ -458,7 +452,10 @@ 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): - return make_hmac(':'.join([purpose, uuid, hosts, cryptedpass])) +def make_passwd_hmac(status, purpose, uid, uuid, hosts, cryptedpass): + return make_hmac(':'.join([status, purpose, uid, uuid, hosts, cryptedpass]))