From 7e6b8413c4d7cc84c3b246c410369c7ecd77e08a Mon Sep 17 00:00:00 2001
From: bmortier <benoit.mortier@opensides.be>
Date: Thu, 5 Oct 2017 21:14:22 +0200
Subject: [PATCH] Merge branch
 '5707-core-fd-schema-as-gosa-in-description-when-its-fd-attributes' into
 '1.3-dev'

Resolve "Core-fd.schema as gosa in description when its fd attributes"

Closes #5707

See merge request !29

(cherry picked from commit 9990582839ce5622d9c11887551eea5505968943)

cadd7c24 :ambulance: fix(schema): Core-fd.schema as gosa in description when its fd attributes
---
 contrib/openldap/core-fd.schema | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema
index 8ce67fc45..f43752f7a 100644
--- a/contrib/openldap/core-fd.schema
+++ b/contrib/openldap/core-fd.schema
@@ -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)
 
 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
   SUBSTR caseIgnoreSubstringsMatch
   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'
-  DESC 'GOsa - DN of an object'
+  DESC 'FusionDirectory - DN of an object'
   EQUALITY caseIgnoreMatch
   SUBSTR caseIgnoreSubstringsMatch
   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'
   MAY  ( description ) )
 
 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 ))
-- 
GitLab