GenCDB

[mirror/userdir-ldap.git] / userdir_ldap.py

diff --git a/userdir_ldap.py b/userdir_ldap.py
index d1881f7..c76992c 100644 (file)
--- a/userdir_ldap.py
+++ b/userdir_ldap.py
@@ -38,7 +38,8 @@ LDAPServer = ConfModule.ldaphost;
 EmailAppend = ConfModule.emailappend;
 AdminUser = ConfModule.adminuser;
 GenerateDir = ConfModule.generatedir;
-GenerateConf = ConfModule.generateconf;
+AllowedGroupsPreload = ConfModule.allowedgroupspreload;
+HomePrefix = ConfModule.homeprefix;
 DefaultGID = ConfModule.defaultgid;
 TemplatesDir = ConfModule.templatesdir;
 PassDir = ConfModule.passdir;
@@ -431,9 +432,12 @@ 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();
+   if 'UD_HMAC_KEY' in os.environ:
+      HmacKey = os.environ['UD_HMAC_KEY']
+   else:
+      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_passwd_hmac(status, purpose, uid, uuid, hosts, cryptedpass):