X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-echelon;h=5e98afc8216529adc96f8caeca3af0e8c6e609d2;hb=2525bf73603cb6487cfcea096e2dc347ad360394;hp=0487d9432c7019559776f3c4236b91ed3539929d;hpb=37b0b5875ff83d8e9a9e8ca918d42fc32b720f06;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-echelon b/ud-echelon
index 0487d94..5e98afc 100755
--- a/ud-echelon
+++ b/ud-echelon
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- mode: python -*-
-import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, posix, getopt;
+import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, os, getopt;
 import string, pwd
 from userdir_gpg import *;
 from userdir_ldap import *;
@@ -12,10 +12,19 @@ Debug = None;
 # Try to extract a key fingerprint from a PGP siged message
 def TryGPG(Email):
    # Try to get a pgp text
-   Msg = GetClearSig(Email);
+   try:
+      Msg = GetClearSig(Email);
+   except:
+      # Log an exception.. but continue. This is to deal with 'sort of' 
+      # PGP-MIME things
+      S = "%s: %s -> %s\n" %(Now,MsgID,ErrMsg);
+      S = S + " %s: %s\n" %(sys.exc_type,sys.exc_value);
+      ErrLog.write(S);
+      return None;
+
    if string.find(Msg[0],"-----BEGIN PGP SIGNED MESSAGE-----") == -1:
       return None;
-      
+
    Res = GPGCheckSig(Msg[0]);
 
    # Failed to find a matching sig
@@ -87,7 +96,7 @@ try:
    global l;
    l = ldap.open(LDAPServer);
    if Debug == None:
-      F = open(PassDir+"/pass-"+pwd.getpwuid(posix.getuid())[0],"r");
+      F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
       AccessPass = string.split(string.strip(F.readline())," ");
       l.simple_bind_s("uid="+AccessPass[0]+","+BaseDn,AccessPass[1]);
       F.close();