X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=sigcheck;h=f3c17f0faeb12b0c132233d949c2205afd0b5b36;hp=fc16d1fcd32552c857f023f8e3dff87aae40b1e3;hb=refs%2Fheads%2Fmaster;hpb=a4df7e3989cce6bdc8e30badc53e88ccb59cb429

diff --git a/sigcheck b/sigcheck
index fc16d1f..f3c17f0 100755
--- a/sigcheck
+++ b/sigcheck
@@ -49,13 +49,14 @@ def verbmsg(msg):
 # 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
@@ -129,12 +130,12 @@ try:
    # 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";