From 64163a31e6abe36e43e8571416cc1d844331fa6c Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 29 Jun 2009 13:50:17 +0200 Subject: [PATCH 1/1] .debian.net DNS creates BSMTP maps for MX 0 master in addition to gluck --- debian/changelog | 6 +++++- ud-generate | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 469cbf7..c6e6cfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ userdir-ldap (0.3.66+XX) unstable; urgency=low + [ Stephen Gran ] * ud-replicate no longer uses localsyncon=*samosa*. * ud-generate cleanup: - general code tidy (whitespace, semi-colons, python idioms) @@ -9,7 +10,10 @@ userdir-ldap (0.3.66+XX) unstable; urgency=low - Stop exporting locked accounts - begin cleanup of use of string exceptions - -- Stephen Gran Sat, 09 May 2009 16:41:36 +0100 + [ Peter Palfrader ] + * .debian.net DNS creates BSMTP maps for MX 0 master in addition to gluck. + + -- Peter Palfrader Mon, 29 Jun 2009 13:49:25 +0200 userdir-ldap (0.3.66) unstable; urgency=low diff --git a/ud-generate b/ud-generate index b8a21f1..dbf1d9d 100755 --- a/ud-generate +++ b/ud-generate @@ -45,7 +45,7 @@ CurrentHost = "" UUID_FORMAT = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$") -BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL) +BSMTPCheck = re.compile(".*mx 0 (gluck|master)\.debian\.org\..*",re.DOTALL) PurposeHostField = re.compile(r".*\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]") DNSZone = ".debian.net" Keyrings = ConfModule.sync_keyrings.split(":") -- 2.20.1