[Da-tools-commits] ./debian/userdir-ldap r411: ud-mailgate: a bug in DoSSH caused all changes to fail that came after DoSSH in

[Peter Palfrader]

------------------------------------------------------------
revno: 411
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Sun 2008-05-18 14:26:33 +0200
message:
  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.
modified:
  debian/changelog
  ud-mailgate
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-18 11:41:10 +0000
+++ b/debian/changelog	2008-05-18 12:26:33 +0000
@@ -3,8 +3,11 @@
   * 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 at debian.org>  Sun, 18 May 2008 13:40:04 +0200
+ -- Peter Palfrader <weasel at debian.org>  Sun, 18 May 2008 14:25:26 +0200
 
 userdir-ldap (0.3.25) unstable; urgency=low
 

=== modified file 'ud-mailgate'
--- a/ud-mailgate	2008-05-17 09:18:45 +0000
+++ b/ud-mailgate	2008-05-18 12:26:33 +0000
@@ -239,6 +239,8 @@
 #  [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: