Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/userdir-ldap

diff --git a/debian/changelog b/debian/changelog
index ea73f96..408a849 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 userdir-ldap (0.3.97) UNRELEASED; urgency=medium
 
+  [ Peter Palfrader ]
   * Make arbitrary attribute change work again.
     This was broken by mistake during the pep8 cleanup.
 
+  [ Adam D. Barratt ]
+  * ud-generate: actually fetch mailDefaultOptions from LDAP
+  * ud-generate: fix typoes in documentation
+
  -- Peter Palfrader <weasel@debian.org>  Sat, 06 Apr 2019 22:04:34 +0200
 
 userdir-ldap (0.3.96) unstable; urgency=medium

diff --git a/doc/ud-generate.8.yo b/doc/ud-generate.8.yo
index bf8505a..41d0c96 100644 (file)
--- a/doc/ud-generate.8.yo
+++ b/doc/ud-generate.8.yo
@@ -8,7 +8,7 @@ manpagesynopsis()
 
 manpagedescription()
 
-ud-generate prouces machine specific versions of the directory in the
+ud-generate produces machine specific versions of the directory in the
 following formats:
 
 itemize(
@@ -16,7 +16,7 @@ itemize(
   it() shadow file [in normal and DB form]
   it() group file [in normal and DB form]
   it() Exim forwarding file [cdb]
-  it() XEarth makers file
+  it() XEarth markers file
   it() SSH authorized key file [cdb and flat]
   it() debian.net DNS zone
 )

diff --git a/ud-generate b/ud-generate
index a787dfa..c1fe54e 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -1130,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"