ud-generate: No longer expand $ in dnsZoneEntry data to a \n\t.

diff --git a/debian/changelog b/debian/changelog
index 3676b8a..5cb9865 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ userdir-ldap (0.3.80) UNRELEASED; urgency=low
     ldap).
   * ud-mailgate: Do not try to do an ldap modify with no changes - now show
     command to changes@ should work again.
+  * ud-generate: No longer expand $ in dnsZoneEntry data to a \n\t.
 
   [ Stephen Gran ]
   * Fix deprecation warnings for sha module by using hashlib module instead
@@ -38,7 +39,7 @@ userdir-ldap (0.3.80) UNRELEASED; urgency=low
   * ud-replicate: set correct permissions for web-passwords
   * add freecdb to depends
 
- -- Peter Palfrader <weasel@debian.org>  Sat, 10 Mar 2012 19:04:59 +0100
+ -- Peter Palfrader <weasel@debian.org>  Mon, 12 Mar 2012 11:37:18 +0100
 
 userdir-ldap (0.3.79) unstable; urgency=low
 

diff --git a/ud-generate b/ud-generate
index 7931ff6..27088e9 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -772,16 +772,13 @@ def GenDNS(accounts, File):
             for z in a["dnsZoneEntry"]:
                Split = z.lower().split()
                if Split[1].lower() == 'in':
-                  for y in range(0, len(Split)):
-                     if Split[y] == "$":
-                        Split[y] = "\n\t"
                   Line = " ".join(Split) + "\n"
                   F.write(Line)
-     
+
                   Host = Split[0] + DNSZone
                   if BSMTPCheck.match(Line) != None:
                      F.write("; Has BSMTP\n")
-     
+
                   # Write some identification information
                   if not RRs.has_key(Host):
                      if Split[2].lower() in ["a", "aaaa"]:
@@ -793,7 +790,7 @@ def GenDNS(accounts, File):
                else:
                   Line = "; Err %s"%(str(Split))
                   F.write(Line)
-     
+
             F.write("\n")
          except Exception, e:
             F.write("; Errors:\n")