# 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;
- l = connectLDAP(LDAPServer);
+ l = userdir_ldap.connectLDAP(LDAPServer);
l.simple_bind_s("","");
# Search for the matching key fingerprint
# See if the group membership is OK
# Only if a group was given on the commandline
- if GroupMember != None:
+ if GroupMember is not None:
Hit = 0;
# Check primary group first
if GAttr[0][1]["gid"][0] == GroupMember:
try:
# Startup the replay cache
ErrType = EX_TEMPFAIL;
- if ReplayCacheFile != None:
+ if ReplayCacheFile is not None:
ErrMsg = "Failed to initialize the replay cache:";
RC = ReplayCache(ReplayCacheFile);
# Get the email
ErrType = EX_PERMFAIL;
ErrMsg = "Failed to understand the email or find a signature:";
- email = email.parser.Parser().parse(sys.stdin);
- MsgID = email["Message-ID"]
+ mail = email.parser.Parser().parse(sys.stdin);
+ MsgID = mail["Message-ID"]
print "Inspecting message %s"%MsgID;
verbmsg("Processing message %s" % MsgID)
- Msg = GetClearSig(email,1);
+ Msg = GetClearSig(mail,1);
if AllowMIME == 0 and Msg[1] != 0:
raise Error, "PGP/MIME disallowed";
raise UDFormatError, "Null signature text"
# Check the signature against the replay cache
- if ReplayCacheFile != None:
+ if ReplayCacheFile is not None:
RC.process(pgp.sig_info)
# Do LDAP stuff
- if LDAPDn != None:
+ if LDAPDn is not None:
CheckLDAP(pgp.key_fpr)
ErrMsg = "Verifying message:";
- if Phrases != None:
+ if Phrases is not None:
F = open(Phrases,"r");
while 1:
Line = F.readline();