projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New version number
[mirror/userdir-ldap.git]
/
sigcheck
diff --git
a/sigcheck
b/sigcheck
index
fc16d1f
..
f3c17f0
100755
(executable)
--- a/
sigcheck
+++ b/
sigcheck
@@
-49,13
+49,14
@@
def verbmsg(msg):
# Match the key fingerprint against an LDAP directory
def CheckLDAP(FingerPrint):
import ldap;
# Match the key fingerprint against an LDAP directory
def CheckLDAP(FingerPrint):
import ldap;
+ import userdir_ldap;
# Connect to the ldap server
global ErrTyp, ErrMsg;
ErrType = EX_TEMPFAIL;
ErrMsg = "An error occurred while performing the LDAP lookup:";
global l;
# Connect to the ldap server
global ErrTyp, ErrMsg;
ErrType = EX_TEMPFAIL;
ErrMsg = "An error occurred while performing the LDAP lookup:";
global l;
- l = connectLDAP(LDAPServer);
+ l =
userdir_ldap.
connectLDAP(LDAPServer);
l.simple_bind_s("","");
# Search for the matching key fingerprint
l.simple_bind_s("","");
# Search for the matching key fingerprint
@@
-129,12
+130,12
@@
try:
# Get the email
ErrType = EX_PERMFAIL;
ErrMsg = "Failed to understand the email or find a signature:";
# Get the email
ErrType = EX_PERMFAIL;
ErrMsg = "Failed to understand the email or find a signature:";
-
e
mail = email.parser.Parser().parse(sys.stdin);
- MsgID =
e
mail["Message-ID"]
+ mail = email.parser.Parser().parse(sys.stdin);
+ MsgID = mail["Message-ID"]
print "Inspecting message %s"%MsgID;
verbmsg("Processing message %s" % MsgID)
print "Inspecting message %s"%MsgID;
verbmsg("Processing message %s" % MsgID)
- Msg = GetClearSig(
e
mail,1);
+ Msg = GetClearSig(mail,1);
if AllowMIME == 0 and Msg[1] != 0:
raise Error, "PGP/MIME disallowed";
if AllowMIME == 0 and Msg[1] != 0:
raise Error, "PGP/MIME disallowed";