projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ud-replicate: Sync only ssh_known_hosts into chroots, not ssh*.
[mirror/userdir-ldap.git]
/
userdir_ldap.py
diff --git
a/userdir_ldap.py
b/userdir_ldap.py
index
0eb4c13
..
e6c628d
100644
(file)
--- 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
# 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;
+import termios, re, imp, ldap, sys, crypt, rfc822
, pwd, os
;
import userdir_gpg
import userdir_gpg
+import hmac
+import sha as sha1_module
try:
File = open("/etc/userdir-ldap/userdir-ldap.conf");
try:
File = open("/etc/userdir-ldap/userdir-ldap.conf");
@@
-27,10
+29,6
@@
except:
ConfModule = imp.load_source("userdir_config","/etc/userdir-ldap.conf",File);
File.close();
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;
# Cheap hack
BaseDn = ConfModule.basedn;
HostBaseDn = ConfModule.hostbasedn;
@@
-456,6
+454,9
@@
def Group2GID(l, name):
return -1
def make_hmac(str):
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 hmac.new(HmacKey, str, sha1_module).hexdigest()
def make_sudopasswd_hmac(purpose, uuid, hosts, cryptedpass):