Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap

* 'master' of git+ssh://db.debian.org/git/userdir-ldap: (21 commits)
  ud-generate: lock replicators
  Set generate_dir in the non-override case
  Get lock sooner, connect to ldap later
  flocks do not need freeing
  Profile if UD_PROFILE is in environment
  No need to depend on python-lockfile anymore
  Use flock()
  Use eatmydata!
  UDLdap.py: make a cache for __getitem__() decisions.
  No need to mkdir userkeys directory anymore
  get rid of global state variable CurrentHost.  This will enable upcoming changes.
  GenerateDir is no longer a global var
  minor nit
  speed up ssh tarball generation
  ud-generate speed, I
  ud-generate: Move main code into a ud_generate()
  ud-generate: Add -f option to build even if cache is current
  ud-generate: Move code into getLastBuildTime() and getLastLDAPChangeTime() functions.
  ud-generate: No longer expand $ in dnsZoneEntry data to a \n\t.
  changelog entry for ud-mailgate fix
  ...

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index 9bce9f4..57cdff0 100644 (file)
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -130,6 +130,7 @@
 #   .13 - whitelist
 #   .14 - bATVToken
 #   .15 - mailDefaultOptions
+#   .16 - mailPreserveSuffixSeparatorRidiculousName
 
 # Public attribute types
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.1 
@@ -504,6 +505,12 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.4.15
        EQUALITY booleanMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
 
+attributetype ( 1.3.6.1.4.1.9586.100.4.4.16
+       NAME 'mailPreserveSuffixSeparatorRidiculousName'
+       DESC 'Whether or not to preserve the suffix serparator'
+       EQUALITY booleanMatch
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
+
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.38
        NAME 'mailContentInspectionAction'
        DESC 'what to do on content inspection hits'
@@ -551,7 +558,7 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.3.1
              onVacation $ privateSub $ sshRSAAuthKey $ supplementaryGid $
              access $ gender $ birthDate $ mailCallout $ mailGreylisting $
               mailRBL $ mailRHSBL $ mailWhitelist $ VoIP $ mailContentInspectionAction $
-              bATVToken $ mailDefaultOptions
+              bATVToken $ mailDefaultOptions $ mailPreserveSuffixSeparatorRidiculousName
        ) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
@@ -573,5 +580,5 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.3.3
        MAY ( emailForward $ supplementaryGid $ allowedHost $ labeledURI $
              mailCallout $ mailGreylisting $ mailRBL $ mailRHSBL $
              mailWhitelist $ dnsZoneEntry $ mailContentInspectionAction $
-              bATVToken $ mailDefaultOptions $ sshRSAAuthKey
+              bATVToken $ mailDefaultOptions $ sshRSAAuthKey $ mailPreserveSuffixSeparatorRidiculousName
        ) )