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

Merge branch 'cherry-pick-99905828' into '1.2-fixes' 

Merge branch '5707-core-fd-schema-as-gosa-in-description-when-its-fd-attributes' into '1.3-dev'

See merge request fusiondirectory/fd!94
parents aaff53eb 7e6b8413
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
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 deletions
+3 -3
contrib/openldap/core-fd.schema
+ 3
− 3
View file @ 1d9c153c
...@@ -40,13 +40,13 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.39 NAME 'gosaSnapshotData' ...@@ -40,13 +40,13 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.39 NAME 'gosaSnapshotData'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 SINGLE-VALUE) SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 SINGLE-VALUE)
attributetype ( 1.3.6.1.4.1.38414.62.1.1 NAME 'fdUserDn' attributetype ( 1.3.6.1.4.1.38414.62.1.1 NAME 'fdUserDn'
DESC 'GOsa - DN of a user' DESC 'FusionDirectory - DN of a user'
EQUALITY caseIgnoreMatch EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.62.1.2 NAME 'fdObjectDn' attributetype ( 1.3.6.1.4.1.38414.62.1.2 NAME 'fdObjectDn'
DESC 'GOsa - DN of an object' DESC 'FusionDirectory - DN of an object'
EQUALITY caseIgnoreMatch EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
...@@ -87,5 +87,5 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject' ...@@ -87,5 +87,5 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject'
MAY ( description ) ) MAY ( description ) )
objectclass ( 1.3.6.1.4.1.38414.62.2.1 NAME 'fdLockEntry' SUP top STRUCTURAL objectclass ( 1.3.6.1.4.1.38414.62.2.1 NAME 'fdLockEntry' SUP top STRUCTURAL
DESC 'GOsa - Class for FD locking' DESC 'FusionDirectory - Class for FD locking'
MUST ( fdUserDn $ fdObjectDn $ cn $ fdLockTimestamp )) MUST ( fdUserDn $ fdObjectDn $ cn $ fdLockTimestamp ))
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