projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finalize changelog for release
[mirror/userdir-ldap.git]
/
ud-echelon
diff --git
a/ud-echelon
b/ud-echelon
index
6d4c38f
..
6c07a0a
100755
(executable)
--- a/
ud-echelon
+++ b/
ud-echelon
@@
-1,7
+1,7
@@
#!/usr/bin/env python
# -*- mode: python -*-
#!/usr/bin/env python
# -*- mode: python -*-
-import userdir_gpg, userdir_ldap, sys, traceback, time, ldap,
posix
, getopt;
-import
string,
pwd
+import userdir_gpg, userdir_ldap, sys, traceback, time, ldap,
os
, getopt;
+import pwd
from userdir_gpg import *;
from userdir_ldap import *;
from userdir_gpg import *;
from userdir_ldap import *;
@@
-22,7
+22,7
@@
def TryGPG(Email):
ErrLog.write(S);
return None;
ErrLog.write(S);
return None;
- if
string.find(Msg[0],
"-----BEGIN PGP SIGNED MESSAGE-----") == -1:
+ if
Msg[0].find(
"-----BEGIN PGP SIGNED MESSAGE-----") == -1:
return None;
Res = GPGCheckSig(Msg[0]);
return None;
Res = GPGCheckSig(Msg[0]);
@@
-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:
@@
-94,10
+94,10
@@
try:
ErrType = EX_TEMPFAIL;
ErrMsg = "An error occured while performing the LDAP lookup";
global l;
ErrType = EX_TEMPFAIL;
ErrMsg = "An error occured while performing the LDAP lookup";
global l;
- l =
ldap.open(LDAPServer);
+ l =
connectLDAP()
if Debug == None:
if Debug == None:
- F = open(PassDir+"/pass-"+pwd.getpwuid(
posix
.getuid())[0],"r");
- AccessPass =
string.split(string.strip(F.readline())," ");
+ F = open(PassDir+"/pass-"+pwd.getpwuid(
os
.getuid())[0],"r");
+ AccessPass =
F.readline().strip().split(" ")
l.simple_bind_s("uid="+AccessPass[0]+","+BaseDn,AccessPass[1]);
F.close();
else:
l.simple_bind_s("uid="+AccessPass[0]+","+BaseDn,AccessPass[1]);
F.close();
else: