From 6bfb2e39cd7bc15ff6a7a7d6f8afec5ad7c8dbc1 Mon Sep 17 00:00:00 2001 From: Martin Zobel-Helas Date: Fri, 23 Mar 2012 19:16:06 +0100 Subject: [PATCH] change mailPreserveSuffixSeparator to a string Signed-off-by: Martin Zobel-Helas --- debian/changelog | 5 ++++- userdir-ldap.schema | 15 ++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6a3f6d3..6931ccb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,8 +61,11 @@ userdir-ldap (0.3.80) UNRELEASED; urgency=low * ud-generate: generate webPasswords * ud-replicate: set correct permissions for web-passwords * add freecdb to depends + * userdir-ldap.schema + - add webPasswords + - add mailPreserveSuffixSeperator - -- Peter Palfrader Mon, 12 Mar 2012 16:56:11 +0100 + -- Martin Zobel-Helas Fri, 23 Mar 2012 19:19:16 +0100 userdir-ldap (0.3.79) unstable; urgency=low diff --git a/userdir-ldap.schema b/userdir-ldap.schema index 57cdff0..73c8640 100644 --- a/userdir-ldap.schema +++ b/userdir-ldap.schema @@ -130,7 +130,7 @@ # .13 - whitelist # .14 - bATVToken # .15 - mailDefaultOptions -# .16 - mailPreserveSuffixSeparatorRidiculousName +# .16 - mailPreserveSuffixSeparator # Public attribute types attributetype ( 1.3.6.1.4.1.9586.100.4.2.1 @@ -506,10 +506,11 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.4.15 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 ) + NAME 'mailPreserveSuffixSeparator' + DESC 'suffix serparator' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1} ) attributetype ( 1.3.6.1.4.1.9586.100.4.2.38 NAME 'mailContentInspectionAction' @@ -558,7 +559,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 $ mailPreserveSuffixSeparatorRidiculousName + bATVToken $ mailDefaultOptions $ mailPreserveSuffixSeparator ) ) objectclass ( 1.3.6.1.4.1.9586.100.4.3.2 @@ -580,5 +581,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 $ mailPreserveSuffixSeparatorRidiculousName + bATVToken $ mailDefaultOptions $ sshRSAAuthKey $ mailPreserveSuffixSeparator ) ) -- 2.20.1