From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 18 May 2008 12:26:33 +0000 (+0200)
Subject: ud-mailgate: a bug in DoSSH caused all changes to fail that came after DoSSH in
X-Git-Tag: userdir-ldap-0.3.26~1
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=b88b250206ceefa82a7018f4539e5e5fee83b8ec

ud-mailgate: a bug in DoSSH caused all changes to fail that came after DoSSH in
HandleChange.  Now DoSSH properly returns without raising an exception if the
line to handle is not an ssh public key.
---

diff --git a/debian/changelog b/debian/changelog
index 765fe93..d5ca5f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ userdir-ldap (0.3.XX) Xnstable; urgency=low
   * ud-replicate: sgran pointed out that if all we care about ignoring is
     EEXIST then we should use mkdir -p instead of [ -d userkeys ] || mkdir
     userkeys.
+  * ud-mailgate: a bug in DoSSH caused all changes to fail that came after
+    DoSSH in HandleChange.  Now DoSSH properly returns without raising an
+    exception if the line to handle is not an ssh public key.
 
- -- Peter Palfrader <weasel@debian.org>  Sun, 18 May 2008 13:40:04 +0200
+ -- Peter Palfrader <weasel@debian.org>  Sun, 18 May 2008 14:25:26 +0200
 
 userdir-ldap (0.3.25) unstable; urgency=low
 
diff --git a/ud-mailgate b/ud-mailgate
index 4da4382..69707f8 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -239,6 +239,8 @@ def LoadBadSSH():
 #  [options] 1024 35 13188913666680[..] [comment]
 def DoSSH(Str, Attrs, badkeys, uid):
    Match = SSH2AuthSplit.match(Str);
+   if Match == None:
+      return None;
    g = Match.groups()
    typekey = g[1]
    if Match == None: