Skip to content
GitLab
Commit 73df28c6 authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Fixes: #1021 recovery.schema should follow LDAP naming rules

parent 05a3bbac
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1 fusiondirectory-1.2 fusiondirectory-1.1.1 fusiondirectory-1.1 fusiondirectory-1.0.20 fusiondirectory-1.0.19 fusiondirectory-1.0.18 fusiondirectory-1.0.17 fusiondirectory-1.0.16 fusiondirectory-1.0.15 fusiondirectory-1.0.14 fusiondirectory-1.0.13 fusiondirectory-1.0.12 fusiondirectory-1.0.11 fusiondirectory-1.0.10 fusiondirectory-1.0.9.3 fusiondirectory-1.0.9.2 fusiondirectory-1.0.9.1 fusiondirectory-1.0.9 fusiondirectory-1.0.8.9 fusiondirectory-1.0.8.8 fusiondirectory-1.0.8.7 fusiondirectory-1.0.8.6 fusiondirectory-1.0.8.5 fusiondirectory-1.0.8.4 fusiondirectory-1.0.8.3 fusiondirectory-1.0.8.2 fusiondirectory-1.0.8.1 fusiondirectory-1.0.8 fusiondirectory-1.0.7.5 fusiondirectory-1.0.7.4 fusiondirectory-1.0.7.3 fusiondirectory-1.0.7.2 fusiondirectory-1.0.7.1 fusiondirectory-1.0.7 fusiondirectory-1.0.6 fusiondirectory-1.0.5 fusiondirectory-1.0.4
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 18 additions and 18 deletions
+18 -18
contrib/openldap/recovery.ldif
+ 9
− 9
View file @ 73df28c6
...@@ -5,13 +5,13 @@ cn: cn=recovery ...@@ -5,13 +5,13 @@ cn: cn=recovery
## recovery.schema - Needed by Fusion Directory for managing password recovery ## recovery.schema - Needed by Fusion Directory for managing password recovery
## ##
# Attributes # Attributes
olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.4.1NAME 'passwordRecoveryActivated' DESC 'Fusion Directory - Password recovery enabled/disabled' EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE ) olcAttributeTypes: ( 1.3.6.1.4.1.38414.1.1.1NAME 'passwordRecoveryActivated' DESC 'Fusion Directory - Password recovery enabled/disabled' EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.4.2NAME 'passwordRecoveryEmail' DESC 'Fusion Directory - Password recovery sender email' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) olcAttributeTypes: ( 1.3.6.1.4.1.38414.1.1.2NAME 'passwordRecoveryEmail' DESC 'Fusion Directory - Password recovery sender email' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.4.3NAME 'passwordRecoveryMailSubject' DESC 'Fusion Directory - Password recovery first email subject' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) olcAttributeTypes: ( 1.3.6.1.4.1.38414.1.1.3NAME 'passwordRecoveryMailSubject' DESC 'Fusion Directory - Password recovery first email subject' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.4.4NAME 'passwordRecoveryMailBody' DESC 'Fusion Directory - Password recovery first email body' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) olcAttributeTypes: ( 1.3.6.1.4.1.38414.1.1.4NAME 'passwordRecoveryMailBody' DESC 'Fusion Directory - Password recovery first email body' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.4.5NAME 'passwordRecoveryMail2Subject' DESC 'Fusion Directory - Password recovery second email subject' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) olcAttributeTypes: ( 1.3.6.1.4.1.38414.1.1.5NAME 'passwordRecoveryMail2Subject' DESC 'Fusion Directory - Password recovery second email subject' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.4.6NAME 'passwordRecoveryMail2Body' DESC 'Fusion Directory - Password recovery second email body' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) olcAttributeTypes: ( 1.3.6.1.4.1.38414.1.1.6NAME 'passwordRecoveryMail2Body' DESC 'Fusion Directory - Password recovery second email body' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.4.7NAME 'passwordRecoveryValidity' DESC 'Fusion Directory - Password recovery link validity in minutes' EQUALITY integerMatch ORDERING integerOrderingMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) olcAttributeTypes: ( 1.3.6.1.4.1.38414.1.1.7NAME 'passwordRecoveryValidity' DESC 'Fusion Directory - Password recovery link validity in minutes' EQUALITY integerMatch ORDERING integerOrderingMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
olcAttributeTypes: ( 1.3.6.1.4.1.38414.2.4.8NAME 'passwordRecoverySalt' DESC 'Fusion Directory - Password recovery token salt' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) olcAttributeTypes: ( 1.3.6.1.4.1.38414.1.1.8NAME 'passwordRecoverySalt' DESC 'Fusion Directory - Password recovery token salt' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
# Object Class # Object Class
olcObjectClasses: ( 1.3.6.1.4.1.38414.2.4.60NAME 'recoveryConfig' DESC 'Password recovery settings' MUST ( cn $ passwordRecoveryActivated $ passwordRecoveryEmail $ passwordRecoveryMailSubject $ passwordRecoveryMailBody $ passwordRecoveryMail2Subject $ passwordRecoveryMail2Body $ passwordRecoveryValidity $ passwordRecoverySalt ) ) olcObjectClasses: ( 1.3.6.1.4.1.38414.1.2.1NAME 'recoveryConfig' DESC 'Password recovery settings' MUST ( cn $ passwordRecoveryActivated $ passwordRecoveryEmail $ passwordRecoveryMailSubject $ passwordRecoveryMailBody $ passwordRecoveryMail2Subject $ passwordRecoveryMail2Body $ passwordRecoveryValidity $ passwordRecoverySalt ) )
contrib/openldap/recovery.schema
+ 9
− 9
View file @ 73df28c6
...@@ -4,50 +4,50 @@ ...@@ -4,50 +4,50 @@
# Attributes # Attributes
attributetype ( 1.3.6.1.4.1.38414.2.4.1 NAME 'passwordRecoveryActivated' attributetype ( 1.3.6.1.4.1.38414.1.1.1 NAME 'passwordRecoveryActivated'
DESC 'Fusion Directory - Password recovery enabled/disabled' DESC 'Fusion Directory - Password recovery enabled/disabled'
EQUALITY booleanMatch EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE ) SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.2.4.2 NAME 'passwordRecoveryEmail' attributetype ( 1.3.6.1.4.1.38414.1.1.2 NAME 'passwordRecoveryEmail'
DESC 'Fusion Directory - Password recovery sender email' DESC 'Fusion Directory - Password recovery sender email'
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.2.4.3 NAME 'passwordRecoveryMailSubject' attributetype ( 1.3.6.1.4.1.38414.1.1.3 NAME 'passwordRecoveryMailSubject'
DESC 'Fusion Directory - Password recovery first email subject' DESC 'Fusion Directory - Password recovery first email subject'
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.2.4.4 NAME 'passwordRecoveryMailBody' attributetype ( 1.3.6.1.4.1.38414.1.1.4 NAME 'passwordRecoveryMailBody'
DESC 'Fusion Directory - Password recovery first email body' DESC 'Fusion Directory - Password recovery first email body'
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.2.4.5 NAME 'passwordRecoveryMail2Subject' attributetype ( 1.3.6.1.4.1.38414.1.1.5 NAME 'passwordRecoveryMail2Subject'
DESC 'Fusion Directory - Password recovery second email subject' DESC 'Fusion Directory - Password recovery second email subject'
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.2.4.6 NAME 'passwordRecoveryMail2Body' attributetype ( 1.3.6.1.4.1.38414.1.1.6 NAME 'passwordRecoveryMail2Body'
DESC 'Fusion Directory - Password recovery second email body' DESC 'Fusion Directory - Password recovery second email body'
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.2.4.7 NAME 'passwordRecoveryValidity' attributetype ( 1.3.6.1.4.1.38414.1.1.7 NAME 'passwordRecoveryValidity'
DESC 'Fusion Directory - Password recovery link validity in minutes' DESC 'Fusion Directory - Password recovery link validity in minutes'
EQUALITY integerMatch EQUALITY integerMatch
ORDERING integerOrderingMatch ORDERING integerOrderingMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
SINGLE-VALUE ) SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.2.4.8 NAME 'passwordRecoverySalt' attributetype ( 1.3.6.1.4.1.38414.1.1.8 NAME 'passwordRecoverySalt'
DESC 'Fusion Directory - Password recovery token salt' DESC 'Fusion Directory - Password recovery token salt'
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
...@@ -55,7 +55,7 @@ attributetype ( 1.3.6.1.4.1.38414.2.4.8 NAME 'passwordRecoverySalt' ...@@ -55,7 +55,7 @@ attributetype ( 1.3.6.1.4.1.38414.2.4.8 NAME 'passwordRecoverySalt'
# Object Class # Object Class
objectclass ( 1.3.6.1.4.1.38414.2.4.60 NAME 'recoveryConfig' objectclass ( 1.3.6.1.4.1.38414.1.2.1 NAME 'recoveryConfig'
DESC 'Password recovery settings' DESC 'Password recovery settings'
MUST ( cn $ passwordRecoveryActivated $ passwordRecoveryEmail $ MUST ( cn $ passwordRecoveryActivated $ passwordRecoveryEmail $
passwordRecoveryMailSubject $ passwordRecoveryMailBody $ passwordRecoveryMailSubject $ passwordRecoveryMailBody $
......
  • bmortier @bmortier

    mentioned in issue #383

    By Côme Chilliet on 2017-09-02T14:45:24 (imported from GitLab)

     ·

    mentioned in issue #383

    By Côme Chilliet on 2017-09-02T14:45:24 (imported from GitLab)

    Toggle commit list
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