projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add dnsTTL host attribute to override the zone default TTL for A and AAAA records...
[mirror/userdir-ldap.git]
/
ud-echelon
diff --git
a/ud-echelon
b/ud-echelon
index
cdca2de
..
6c07a0a
100755
(executable)
--- a/
ud-echelon
+++ b/
ud-echelon
@@
-1,7
+1,7
@@
#!/usr/bin/env python
# -*- mode: python -*-
import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, os, getopt;
#!/usr/bin/env python
# -*- mode: python -*-
import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, os, getopt;
-import
string,
pwd
+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]);
@@
-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:
F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
if Debug == None:
F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
- AccessPass =
string.split(string.strip(F.readline())," ");
+ 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: