diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-08-24 10:21:07 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-08-24 11:21:59 +0200 |
commit | add8a8188086a32bfc558f8086062b30b3939ab2 (patch) | |
tree | 647922deabfd81fbaa6d8a5fb026da40ba452f33 | |
parent | 4e377914bf12fc3cc6b15ca4a99d6e755f141805 (diff) |
Remove no-longer used files related to LDAP mapping
They appear to be unused ever since c8dddd5a6b7fa273b0cebfb5d8b2794cce90eca7
"#i101955# adapted LDAP backend to new interface, dropped
registry/ldap/*-attr.map files, replaced
registry/data/org/openoffice/LDAP.xcu.sample with registry/oo-ldap.xcd.sample
and registry/oo-ad-ldap.xcd.sample".
(8b3807dbc925e69afcf20bf619986e832ee19845 "do not deliver unused files" had not
dared to remove them completely.)
Change-Id: I46daa90025ee30a1644d4ca48470e8f1fe8b4473
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101264
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r-- | officecfg/registry/schema/oo-common-ad.ldf | 136 | ||||
-rw-r--r-- | officecfg/registry/schema/oo-common.conf | 22 | ||||
-rw-r--r-- | officecfg/registry/schema/oo-common.ldif | 20 | ||||
-rw-r--r-- | officecfg/registry/schema/oo-ldap-attr-map.properties | 67 | ||||
-rw-r--r-- | officecfg/registry/schema/oo-org-map.properties | 40 |
5 files changed, 0 insertions, 285 deletions
diff --git a/officecfg/registry/schema/oo-common-ad.ldf b/officecfg/registry/schema/oo-common-ad.ldf deleted file mode 100644 index 871549084f7c..000000000000 --- a/officecfg/registry/schema/oo-common-ad.ldf +++ /dev/null @@ -1,136 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# -#################################################### -#LDIF Script for extending Active Directory Schema -#################################################### -dn: CN=oo-registry-object-attr, CN=Schema, CN=Configuration,DC=sun, DC=com -changetype: add -attributeID: 1.3.6.1.4.1.9770.2.1.1 -attributeSyntax: 2.5.5.12 -isSingleValued: TRUE -lDAPDisplayName: oo-registry-object-attr -objectClass: attributeSchema -oMSyntax: 64 - -dn: CN=oo-org-mapping-attr,CN=Schema,CN=Configuration,DC=sun, DC=com -changetype: add -attributeID: 1.3.6.1.4.1.9770.2.1.2 -attributeSyntax: 2.5.5.12 -isSingleValued: TRUE -lDAPDisplayName: oo-org-mapping-attr -objectClass: attributeSchema -oMSyntax: 64 - -dn: CN=oo-ldap-attr-mapping-attr, CN=Schema,CN=Configuration,DC=sun, DC=com -changetype: add -attributeID: 1.3.6.1.4.1.9770.2.1.3 -attributeSyntax: 2.5.5.12 -isSingleValued: TRUE -lDAPDisplayName:oo-ldap-attr-mapping-attr -objectClass: attributeSchema -oMSyntax: 64 - -dn: CN=oo-role-priority-attr,CN=Schema,CN=Configuration,DC=sun, DC=com -changetype: add -attributeID: 1.3.6.1.4.1.9770.2.1.4 -attributeSyntax: 2.5.5.12 -isSingleValued: TRUE -lDAPDisplayName:oo-role-priority-attr -objectClass: attributeSchema -oMSyntax: 64 - -dn: -changetype: modify -add: schemaUpdateNow -schemaUpdateNow: 1 -- - -dn: CN=oo-registry-object, CN=Schema, CN=Configuration,DC=sun, DC=com -changetype: add -governsID: 1.3.6.1.4.1.9770.2.2.1 -lDAPDisplayName:oo-registry-object -maycontain: cn -mayContain: oo-registry-object-attr -objectClass: classSchema -objectClassCategory: 1 -possSuperiors: User -subClassOf: top -defaultHidingValue: FALSE -showInAdvancedViewOnly: FALSE - - -dn: CN=oo-registry-meta-class, CN=Schema, CN=Configuration,DC=sun, DC=com -changetype: add -governsID: 1.3.6.1.4.1.9770.2.2.2 -lDAPDisplayName:oo-registry-meta-class -mayContain: oo-org-mapping-attr -mayContain: oo-ldap-attr-mapping-attr -objectClass: classSchema -objectClassCategory: 1 -possSuperiors:domainDNS -subClassOf: oo-registry-object -defaultHidingValue: FALSE -showInAdvancedViewOnly: FALSE - -dn: CN=oo-prioritised-role, CN=Schema, CN=Configuration,DC=sun, DC=com -changetype: add -governsID: 1.3.6.1.4.1.9770.2.2.3 -lDAPDisplayName: oo-prioritised-role -mayContain: oo-role-priority-attr -objectClass: classSchema -objectClassCategory: 3 -subClassOf: top -defaultHidingValue: FALSE -showInAdvancedViewOnly: FALSE - -dn: -changetype: modify -add: schemaUpdateNow -schemaUpdateNow: 1 -- - -dn: CN=Group, CN=Schema, CN=Configuration,DC=sun, DC=com -changetype: modify -add: auxiliaryClass -auxilaryClass: oo-prioritised-role -- - -dn: CN=oo-registry-object, CN=Schema,CN=Configuration,DC=sun, DC=com -changetype: modify -add: possSuperiors -possSuperiors: oo-registry-meta-class -- - -dn: CN=oo-registry-object, CN=Schema,CN=Configuration,DC=sun, DC=com -changetype: modify -add: possSuperiors -possSuperiors: oo-registry-object -- - -dn: -changetype: modify -add: schemaUpdateNow -schemaUpdateNow: 1 -- - - - - - - - diff --git a/officecfg/registry/schema/oo-common.conf b/officecfg/registry/schema/oo-common.conf deleted file mode 100644 index 61fc0cc9ac7c..000000000000 --- a/officecfg/registry/schema/oo-common.conf +++ /dev/null @@ -1,22 +0,0 @@ -attribute oo-org-mapping-attr oo-org-mapping-attr-oid cis single -attribute oo-ldap-attr-mapping-attr oo-ldap-attr-mapping-attr-oid cis single -attribute oo-registry-object-attr oo-registry-object-attr-oid cis single -attribute oo-role-priority-attr oo-role-priority-attr-oid cis single -objectclass oo-registry-object - oid - oo-registry-object-oid - superior top - allows - cn,oo-registry-object-attr -objectclass oo-registry-meta-class - oid - oo-registry-meta-oid - superior oo-registry-object - allows - oo-org-mapping-attr,oo-ldap-attr-mapping-attr -objectclass oo-prioritised-role - oid - oo-prioritised-role-oid - superior top - allows - oo-role-priority-attr diff --git a/officecfg/registry/schema/oo-common.ldif b/officecfg/registry/schema/oo-common.ldif deleted file mode 100644 index 5f80bfa77019..000000000000 --- a/officecfg/registry/schema/oo-common.ldif +++ /dev/null @@ -1,20 +0,0 @@ -dn: cn=schema -attributetypes: (oo-registry-object-attr-oid NAME 'oo-registry-object-attr' DESC 'Generic registry container' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE_VALUE ) - -dn: cn=schema -objectclasses: ( oo-registry-object-oid NAME 'oo-registry-object' DESC 'oo-registry-object objclass' SUP 'top' MAY (cn $ oo-registry-object-attr $)) - -dn: cn=schema -attributetypes: (oo-org-mapping-attr-oid NAME 'oo-org-mapping-attr' DESC 'organizational mapping' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE_VALUE ) - -dn: cn=schema -attributetypes: (oo-ldap-attr-mapping-attr-oid NAME 'oo-ldap-attr-mapping-attr' DESC 'ldap attribute mapping' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE_VALUE ) - -dn: cn=schema -objectclasses: (oo-registry-meta-class-oid NAME 'oo-registry-meta-class' DESC 'meta configuration of oo registry' SUP 'oo-registry-object' MAY (oo-org-mapping-attr $ oo-ldap-attr-mapping-attr $)) - -dn: cn=schema -attributetypes: (oo-role-priority-attr-oid NAME 'oo-role-priority-attr' DESC 'Role priority' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE_VALUE) - -dn: cn=schema -objectclasses: (oo-prioritised-role-oid NAME 'oo-prioritised-role' DESC 'Role with a priority used by the oo registry' SUP 'top' MAY (oo-role-priority-attr $)) diff --git a/officecfg/registry/schema/oo-ldap-attr-map.properties b/officecfg/registry/schema/oo-ldap-attr-map.properties deleted file mode 100644 index 0d4222da8e4c..000000000000 --- a/officecfg/registry/schema/oo-ldap-attr-map.properties +++ /dev/null @@ -1,67 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -# inetOrgPerson.givenName -# x-no-translate -org.openoffice.UserProfile/Data/givenname = givenname - -# person.sn -org.openoffice.UserProfile/Data/sn = sn - -# inetOrgPerson.initials -org.openoffice.UserProfile/Data/initials = initials - -# organizationalPerson.street -org.openoffice.UserProfile/Data/street = street,postalAddress,streetAddress - -# organizationalPerson.l (city) -org.openoffice.UserProfile/Data/l = l - -# organizationalPerson.st (state) -org.openoffice.UserProfile/Data/st = st - -# organizationalPerson.postalCode -org.openoffice.UserProfile/Data/postalcode = postalcode - -# country.c (country) -org.openoffice.UserProfile/Data/c = - -# organizationalPerson.o (company) -org.openoffice.UserProfile/Data/o = o,organizationName - -# deprecated -- no LDAP corollary -org.openoffice.UserProfile/Data/position = - -# organizationalPerson.title -org.openoffice.UserProfile/Data/title = title - -# inetOrgPerson.homePhone -org.openoffice.UserProfile/Data/homephone = homephone - -# organizationalPerson.telephoneNumber -org.openoffice.UserProfile/Data/telephonenumber = telephonenumber - -# organizationalPerson.facsimileTelephoneNumber -org.openoffice.UserProfile/Data/facsimiletelephonenumber = facsimiletelephonenumber,officeFax - -# inetOrgPerson.mail -org.openoffice.UserProfile/Data/mail = mail - -# Deprecated -#UserGroup = - diff --git a/officecfg/registry/schema/oo-org-map.properties b/officecfg/registry/schema/oo-org-map.properties deleted file mode 100644 index 251963e07eec..000000000000 --- a/officecfg/registry/schema/oo-org-map.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -# attribute and objectclass identifying a user -# multi values are supported, separated by comma -# x-no-translate -User/ObjectClass=inetorgperson -User/NamingAttribute=uid -User/Container=ou=People -User/DisplayNameFormat=sn, givenname - -# attribute and objectclass identifying roles -# multi values are supported, separated by comma -Role/Static/ObjectClass=groupofuniquenames -Role/Static/NamingAttribute=cn -Role/Static/UserAttribute=uniquemember -Role/Dynamic/ObjectClass=groupofuniquenames -Role/Dynamic/NamingAttribute=cn -Role/Dynamic/UserAttribute=memberof -Role/Container=ou=Groups - -# attribute and objectclass identifying organisations -# multi values are supported, separated by comma -Organisation/ObjectClass=organization -Organisation/NamingAttribute=o
\ No newline at end of file |