Skip to content
GitLab
Commit c36ea848 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

:ambulance: fix(postfix) Small fixes on contributed code and schema 

issue #5761
parent b8226e34
dev 6104-mail-methods-refactor 6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued 6237-add-requiredattrs-array-to-the-webservice-informations 6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines 6250-supann-configuration-backend-requires-account-life-cycle-section 6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects 6346-lifecycle-adaptation-to-select-supann-resources-and-related-states-via-regex-mechanism master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 29 additions and 16 deletions
+29 -16
postfix/admin/systems/services/postfix/class_servicePostfix.inc
+ 26
− 13
View file @ c36ea848
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
This code is part of FusionDirectory (http://www.fusiondirectory.org/) This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier Copyright (C) 2003-2010 Cajus Pollmeier
Copyright (C) 2011-2016 FusionDirectory Copyright (C) 2011-2018 FusionDirectory
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -21,20 +21,27 @@ ...@@ -21,20 +21,27 @@
class CatchallDomainAttribute extends StringAttribute class CatchallDomainAttribute extends StringAttribute
{ {
function fixPostValue ($value) /*! \brief Return the ldap value in the correct intern format value
*
* \param $ldapValue The value as found in the LDAP
*/
function inputValue ($ldapValue)
{ {
/* prepend '@' for postfix catchall mapping */ /* remove initial '@' from value */
if ($value) { return preg_replace('/^@/', '', $ldapValue);
return '@'.parent::fixPostValue($value);
} else {
return $value;
}
} }
function displayValue ($value) /*! \brief Computes LDAP value
*/
function computeLdapValue ()
{ {
/* remove initial '@' from display */ return '@'.$this->getValue();
return '@' == substr($value, 0, 1) ? substr($value, 1) : $value; }
function setValue ($value)
{
/* remove initial '@' if needed */
return parent::setValue(preg_replace('/^@/', '', $value));
} }
} }
...@@ -120,8 +127,14 @@ class servicePostfix extends simpleService ...@@ -120,8 +127,14 @@ class servicePostfix extends simpleService
_('Catchall table'), _('Catchall table'), _('Catchall table'), _('Catchall table'),
'fdPostfixCatchallTable', 'fdPostfixCatchallTable', 'fdPostfixCatchallTable', 'fdPostfixCatchallTable',
array( array(
new CatchallDomainAttribute ('Domain', '', 'fdCatchallTableDomain'), new CatchallDomainAttribute (
new MailAttribute ('Recipient', '', 'fdCatchallTableRecipient') _('Domain'), _('Domain concerned by this catchall rule'),
'fdCatchallTableDomain', TRUE
),
new MailAttribute (
_('Recipient'), _('Recipient mail address for this catchall rule'),
'fdCatchallTableRecipient', TRUE
)
) )
) )
) )
......
postfix/contrib/openldap/postfix-fd.schema
+ 3
− 3
View file @ c36ea848
...@@ -72,13 +72,13 @@ attributetype ( 1.3.6.1.4.1.38414.10.12.2 NAME 'fdTransportTableRule' ...@@ -72,13 +72,13 @@ attributetype ( 1.3.6.1.4.1.38414.10.12.2 NAME 'fdTransportTableRule'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE) SINGLE-VALUE)
attributetype ( 1.3.6.1.4.1.38414.10.11.12 NAME 'fdCatchallTableDomain' attributetype ( 1.3.6.1.4.1.38414.10.13.1 NAME 'fdCatchallTableDomain'
DESC 'FusionDirectory - postfix catchall table domain' DESC 'FusionDirectory - postfix catchall table domain'
EQUALITY caseExactIA5Match EQUALITY caseExactIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE) SINGLE-VALUE)
attributetype ( 1.3.6.1.4.1.38414.10.11.13 NAME 'fdCatchallTableRecipient' attributetype ( 1.3.6.1.4.1.38414.10.13.2 NAME 'fdCatchallTableRecipient'
DESC 'FusionDirectory - postfix catchall table recipient' DESC 'FusionDirectory - postfix catchall table recipient'
EQUALITY caseExactIA5Match EQUALITY caseExactIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
...@@ -99,7 +99,7 @@ objectclass (1.3.6.1.4.1.38414.10.2.4 NAME 'fdPostfixTransportTable' ...@@ -99,7 +99,7 @@ objectclass (1.3.6.1.4.1.38414.10.2.4 NAME 'fdPostfixTransportTable'
MUST ( fdTransportTableMatch $ fdTransportTableRule ) MUST ( fdTransportTableMatch $ fdTransportTableRule )
MAY ( ) ) MAY ( ) )
objectclass (1.3.6.1.4.1.38414.10.2.6 NAME 'fdPostfixCatchallTable' objectclass (1.3.6.1.4.1.38414.10.2.5 NAME 'fdPostfixCatchallTable'
DESC 'FusionDirectory - Postfix catchall table line' DESC 'FusionDirectory - Postfix catchall table line'
MUST ( fdCatchallTableDomain $ fdCatchallTableRecipient ) MUST ( fdCatchallTableDomain $ fdCatchallTableRecipient )
MAY ( ) ) MAY ( ) )
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment