projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added code to support pressing C-c or C-d without having the system
[mirror/userdir-ldap.git]
/
ud-echelon
diff --git
a/ud-echelon
b/ud-echelon
index
6d4c38f
..
cdca2de
100755
(executable)
--- a/
ud-echelon
+++ b/
ud-echelon
@@
-1,6
+1,6
@@
#!/usr/bin/env python
# -*- mode: python -*-
#!/usr/bin/env python
# -*- mode: python -*-
-import userdir_gpg, userdir_ldap, sys, traceback, time, ldap,
posix
, getopt;
+import userdir_gpg, userdir_ldap, sys, traceback, time, ldap,
os
, getopt;
import string, pwd
from userdir_gpg import *;
from userdir_ldap import *;
import string, pwd
from userdir_gpg import *;
from userdir_ldap import *;
@@
-34,7
+34,7
@@
def TryGPG(Email):
return None;
# Search for the matching key fingerprint
return None;
# Search for the matching key fingerprint
- Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"key
fingerp
rint=" + Res[2][1]);
+ Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"key
FingerP
rint=" + Res[2][1]);
if len(Attrs) == 0:
return None;
if len(Attrs) != 1:
if len(Attrs) == 0:
return None;
if len(Attrs) != 1:
@@
-96,7
+96,7
@@
try:
global l;
l = ldap.open(LDAPServer);
if Debug == None:
global l;
l = ldap.open(LDAPServer);
if Debug == None:
- F = open(PassDir+"/pass-"+pwd.getpwuid(
posix
.getuid())[0],"r");
+ F = open(PassDir+"/pass-"+pwd.getpwuid(
os
.getuid())[0],"r");
AccessPass = string.split(string.strip(F.readline())," ");
l.simple_bind_s("uid="+AccessPass[0]+","+BaseDn,AccessPass[1]);
F.close();
AccessPass = string.split(string.strip(F.readline())," ");
l.simple_bind_s("uid="+AccessPass[0]+","+BaseDn,AccessPass[1]);
F.close();