X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=sigcheck;h=1ba2a8d7d1a43b58ea70842c44c8291703e405d0;hb=595923978a9ad55f4ec55b1aabef44683b111911;hp=95db70814b2adc4b65fdac1bed65b18817da2cf4;hpb=b1767d1efb529fbbddd895afce31609abdb87e36;p=mirror%2Fuserdir-ldap.git

diff --git a/sigcheck b/sigcheck
index 95db708..1ba2a8d 100755
--- a/sigcheck
+++ b/sigcheck
@@ -25,7 +25,7 @@
 #      -e /etc/userdir-ldap/templtes/error-reply -- test.sh
 
 import sys, traceback, time, os;
-import string, pwd, getopt;
+import pwd, getopt;
 from userdir_gpg import *;
 
 EX_TEMPFAIL = 75;
@@ -54,7 +54,7 @@ def CheckLDAP(FingerPrint):
    ErrType = EX_TEMPFAIL;
    ErrMsg = "An error occurred while performing the LDAP lookup:";
    global l;
-   l = ldap.open(LDAPServer);
+   l = connectLDAP(LDAPServer);
    l.simple_bind_s("","");
 
    # Search for the matching key fingerprint
@@ -100,7 +100,7 @@ for (switch, val) in options:
    if (switch == '-r'):
       ReplayCacheFile = val;
    elif (switch == '-k'):
-      SetKeyrings(string.split(val,":"));
+      SetKeyrings(val.split(":"));
    elif (switch == '-d'):
       LDAPDn = val;
    elif (switch == '-l'):
@@ -139,7 +139,7 @@ try:
       raise Error, "PGP/MIME disallowed";
   
    ErrMsg = "Message is not PGP signed:"
-   if string.find(Msg[0],"-----BEGIN PGP SIGNED MESSAGE-----") == -1:
+   if Msg[0].find("-----BEGIN PGP SIGNED MESSAGE-----") == -1:
       raise Error, "No PGP signature";
    
    # Check the signature
@@ -171,8 +171,8 @@ try:
       while 1:
 	  Line = F.readline();
 	  if Line == "": break;
-	  if string.find(Res[3],string.strip(Line)) == -1:
-	      raise Error,"Phrase '%s' was not found"%(string.strip(Line));
+	  if Res[3].find(Line.strip()) == -1:
+	      raise Error,"Phrase '%s' was not found" % (Line.strip())
       
 except:
    ErrMsg = "[%s] \"%s\" \"%s %s\"\n"%(Now,MsgID,ErrMsg,sys.exc_value);