...
 
Commits (2)
...@@ -9,6 +9,7 @@ userdir-ldap (0.3.97) UNRELEASED; urgency=medium ...@@ -9,6 +9,7 @@ userdir-ldap (0.3.97) UNRELEASED; urgency=medium
[ Adam D. Barratt ] [ Adam D. Barratt ]
* ud-generate: actually fetch mailDefaultOptions from LDAP * ud-generate: actually fetch mailDefaultOptions from LDAP
* ud-generate: fix typoes in documentation * ud-generate: fix typoes in documentation
* ud-generate: make mail-default-options global rather than per-host
[ Julien Cristau ] [ Julien Cristau ]
* ud-mailgate: don't let punycode through. * ud-mailgate: don't let punycode through.
......
...@@ -1210,6 +1210,8 @@ def generate_all(global_dir, ldap_conn): ...@@ -1210,6 +1210,8 @@ def generate_all(global_dir, ldap_conn):
GenDBM(accounts, global_dir + "mail-forward.db", 'emailForward') GenDBM(accounts, global_dir + "mail-forward.db", 'emailForward')
GenCDB(accounts, global_dir + "mail-contentinspectionaction.cdb", 'mailContentInspectionAction') GenCDB(accounts, global_dir + "mail-contentinspectionaction.cdb", 'mailContentInspectionAction')
GenDBM(accounts, global_dir + "mail-contentinspectionaction.db", 'mailContentInspectionAction') GenDBM(accounts, global_dir + "mail-contentinspectionaction.db", 'mailContentInspectionAction')
GenCDB(accounts, global_dir + "default-mail-options.cdb", 'mailDefaultOptions')
GenDBM(accounts, global_dir + "default-mail-options.db", 'mailDefaultOptions')
GenPrivate(accounts, global_dir + "debian-private") GenPrivate(accounts, global_dir + "debian-private")
GenSSHKnown(host_attrs, global_dir+"authorized_keys", 'authorized_keys', global_dir+'ud-generate.lock') GenSSHKnown(host_attrs, global_dir+"authorized_keys", 'authorized_keys', global_dir+'ud-generate.lock')
GenMailBool(accounts, global_dir + "mail-greylist", "mailGreylisting") GenMailBool(accounts, global_dir + "mail-greylist", "mailGreylisting")
...@@ -1302,12 +1304,12 @@ def generate_host(host, global_dir, all_accounts, all_hosts, ssh_userkeys): ...@@ -1302,12 +1304,12 @@ def generate_host(host, global_dir, all_accounts, all_hosts, ssh_userkeys):
DoLink(global_dir, OutDir, "mail-rhsbl") DoLink(global_dir, OutDir, "mail-rhsbl")
DoLink(global_dir, OutDir, "mail-whitelist") DoLink(global_dir, OutDir, "mail-whitelist")
DoLink(global_dir, OutDir, "all-accounts.json") DoLink(global_dir, OutDir, "all-accounts.json")
DoLink(global_dir, Outdir, "default-mail-options.cdb")
DoLink(global_dir, Outdir, "default-mail-options.db")
GenCDB(accounts, OutDir + "user-forward.cdb", 'emailForward') GenCDB(accounts, OutDir + "user-forward.cdb", 'emailForward')
GenDBM(accounts, OutDir + "user-forward.db", 'emailForward') GenDBM(accounts, OutDir + "user-forward.db", 'emailForward')
GenCDB(accounts, OutDir + "batv-tokens.cdb", 'bATVToken') GenCDB(accounts, OutDir + "batv-tokens.cdb", 'bATVToken')
GenDBM(accounts, OutDir + "batv-tokens.db", 'bATVToken') GenDBM(accounts, OutDir + "batv-tokens.db", 'bATVToken')
GenCDB(accounts, OutDir + "default-mail-options.cdb", 'mailDefaultOptions')
GenDBM(accounts, OutDir + "default-mail-options.db", 'mailDefaultOptions')
# Compatibility. # Compatibility.
DoLink(global_dir, OutDir, "forward-alias") DoLink(global_dir, OutDir, "forward-alias")
......