Merge from zobel: Fix userdir-ldap.schema (objectClass now contains MAY: VoIP)

diff --git a/debian/changelog b/debian/changelog
index 55cf883..c0e5019 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-userdir-ldap (0.3.25+common1) unstable; urgency=low
+userdir-ldap (0.3.26) unstable; urgency=low
 
-  * Fix userdir-ldap.schema (objectClass now contains MAY: VoIP)
+  * 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.
+  * Fix userdir-ldap.schema (objectClass now contains MAY: VoIP). [zobel]
 
- -- Martin Zobel-Helas <zobel@debian.org>  Sun, 18 May 2008 13:03:42 +0200
+ -- Peter Palfrader <weasel@debian.org>  Sun, 18 May 2008 14:27:50 +0200
 
 userdir-ldap (0.3.25) unstable; urgency=low
 

diff --git a/ud-mailgate b/ud-mailgate
index 4da4382..69707f8 100755 (executable)
--- 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:

diff --git a/ud-replicate b/ud-replicate
index d2a065f..a9e294b 100755 (executable)
--- a/ud-replicate
+++ b/ud-replicate
@@ -81,7 +81,7 @@ if [ -e ${HOST}/ssh-keys.tar.gz ]; then
   export TMPDIR='/tmp/'
   tempdir=$(mktemp -d)
   tar -C "$tempdir" -xf ${HOST}/ssh-keys.tar.gz
-  [ -d userkeys ] || mkdir userkeys
+  mkdir -p userkeys
   chmod 755 $tempdir
   rsync -a --delete-after $tempdir/ userkeys/
 fi