add changelog entries for ud-mailgate blocking punycode and ipv6 parsing fix

[mirror/userdir-ldap.git] / ud-generate

diff --git a/ud-generate b/ud-generate
index cf49f0f..c1fe54e 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -966,29 +966,6 @@ def GenZoneRecords(host_attrs, File):
          for Line in ExtractDNSInfo(x):
             F.write(Line + "\n")
 
-        # this would write sshfp lines for services on machines
-        # but we can't yet, since some are cnames and we'll make
-        # an invalid zonefile
-        #
-        # for i in x[1].get("purpose", []):
-        #    m = PurposeHostField.match(i)
-        #    if m:
-        #       m = m.group(1)
-        #       # we ignore [[*..]] entries
-        #       if m.startswith('*'):
-        #          continue
-        #       if m.startswith('-'):
-        #          m = m[1:]
-        #       if m:
-        #          if not m.endswith(HostDomain):
-        #             continue
-        #          if not m.endswith('.'):
-        #             m = m + "."
-        #          for Line in DNSInfo:
-        #             if isSSHFP.match(Line):
-        #                Line = "%s\t%s" % (m, Line)
-        #                F.write(Line + "\n")
-
    # Oops, something unspeakable happened.
    except:
       Die(File, F, None)
@@ -1153,7 +1130,7 @@ def get_accounts(ldap_conn):
                     "mailGreylisting", "mailCallout", "mailRBL", "mailRHSBL",\
                     "mailWhitelist", "sudoPassword", "objectClass", "accountStatus",\
                     "mailContentInspectionAction", "webPassword", "rtcPassword",\
-                    "bATVToken", "totpSeed"])
+                    "bATVToken", "totpSeed", "mailDefaultOptions"])
 
    if passwd_attrs is None:
       raise UDEmptyList, "No Users"