[Pkg-openldap-devel] [openldap] 02/02: strip Internet-Draft text from duaconf.schema
Ryan Tandy
rtandy-guest at moszumanska.debian.org
Tue Sep 30 04:37:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
rtandy-guest pushed a commit to branch master
in repository openldap.
commit f7b97dbc2bc8f0b3d7f25ec1f7bfd28d76c83720
Author: Ryan Tandy <ryan at nardis.ca>
Date: Mon Sep 29 21:19:41 2014 -0700
strip Internet-Draft text from duaconf.schema
---
debian/changelog | 2 +
{servers/slapd => debian}/schema/duaconf.schema | 130 ++----------------------
2 files changed, 13 insertions(+), 119 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d685a57..3c61556 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ openldap (2.4.39-2) UNRELEASED; urgency=low
* debian/schema/pmi.schema: Add a copyright clarification. There does not
appear to be any copyrighted text in this file, only ASN.1 assignments and
LDAP schema definitions. Fixes a Lintian error on the original.
+ * debian/schema/duaconf.schema: Strip Internet-Draft text from
+ duaconf.schema.
[ Jelmer Vernooij ]
* Depend on heimdal-multidev rather than heimdal-dev. (Closes: #745356,
diff --git a/servers/slapd/schema/duaconf.schema b/debian/schema/duaconf.schema
similarity index 55%
rename from servers/slapd/schema/duaconf.schema
rename to debian/schema/duaconf.schema
index d8e53d4..8c1683f 100644
--- a/servers/slapd/schema/duaconf.schema
+++ b/debian/schema/duaconf.schema
@@ -27,119 +27,18 @@
## in the DUAConfigProfile objectClass definition
## - Credit goes to the original Authors
-#
-# Application Working Group M. Ansari
-# INTERNET-DRAFT Sun Microsystems, Inc.
-# Expires Febuary 2003 L. Howard
-# PADL Software Pty. Ltd.
-# B. Joslin [ed.]
-# Hewlett-Packard Company
-#
-# September 15th, 2003
-# Intended Category: Informational
-#
-#
-# A Configuration Schema for LDAP Based
-# Directory User Agents
-# <draft-joslin-config-schema-07.txt>
+# The version of this file as distributed by the OpenLDAP Foundation
+# contains text from an IETF Internet-Draft explaining the schema.
+# Unfortunately, that text is covered by a license that doesn't meet
+# Debian's Free Software Guidelines. This is a stripped version of the
+# schema that contains only the functional schema definition, not the text
+# of the Internet-Draft.
#
-#Status of this Memo
-#
-# This memo provides information for the Internet community. This
-# memo does not specify an Internet standard of any kind. Distribu-
-# tion of this memo is unlimited.
-#
-# This document is an Internet-Draft and is in full conformance with
-# all provisions of Section 10 of RFC2026.
-#
-# This document is an Internet-Draft. Internet-Drafts are working
-# documents of the Internet Engineering Task Force (IETF), its areas,
-# and its working groups. Note that other groups may also distribute
-# working documents as Internet-Drafts.
-#
-# Internet-Drafts are draft documents valid for a maximum of six
-# months. Internet-Drafts may be updated, replaced, or made obsolete
-# by other documents at any time. It is not appropriate to use
-# Internet-Drafts as reference material or to cite them other than as
-# a "working draft" or "work in progress".
-#
-# To learn the current status of any Internet-Draft, please check the
-# 1id-abstracts.txt listing contained in the Internet-Drafts Shadow
-# Directories on ds.internic.net (US East Coast), nic.nordu.net
-# (Europe), ftp.isi.edu (US West Coast), or munnari.oz.au (Pacific
-# Rim).
-#
-# Distribution of this document is unlimited.
-#
-#
-# Abstract
-#
-# This document describes a mechanism for global configuration of
-# similar directory user agents. This document defines a schema for
-# configuration of these DUAs that may be discovered using the Light-
-# weight Directory Access Protocol in RFC 2251[17]. A set of attri-
-# bute types and an objectclass are proposed, along with specific
-# guidelines for interpreting them. A significant feature of the
-# global configuration policy for DUAs is a mechanism that allows
-# DUAs to re-configure their schema to that of the end user's
-# environment. This configuration is achieved through attribute and
-# objectclass mapping. This document is intended to be a skeleton
-# for future documents that describe configuration of specific DUA
-# services.
-#
-#
-# [trimmed]
-#
-#
-# 2. General Issues
-#
-# The schema defined by this document is defined under the "DUA Con-
-# figuration Schema." This schema is derived from the OID: iso (1)
-# org (3) dod (6) internet (1) private (4) enterprises (1) Hewlett-
-# Packard Company (11) directory (1) LDAP-UX Integration Project (3)
-# DUA Configuration Schema (1). This OID is represented in this
-# document by the keystring "DUAConfSchemaOID"
-# (1.3.6.1.4.1.11.1.3.1).
+# For an explanation of this schema, see
+# draft-joslin-config-schema-07.txt.
+
objectidentifier DUAConfSchemaOID 1.3.6.1.4.1.11.1.3.1
-#
-# 2.2 Attributes
-#
-# The attributes and classes defined in this document are summarized
-# below.
-#
-# The following attributes are defined in this document:
-#
-# preferredServerList
-# defaultServerList
-# defaultSearchBase
-# defaultSearchScope
-# authenticationMethod
-# credentialLevel
-# serviceSearchDescriptor
-#
-#
-#
-# Joslin [Page 3]
-# Internet-Draft DUA Configuration Schema October 2002
-#
-#
-# serviceCredentialLevel
-# serviceAuthenticationMethod
-# attributeMap
-# objectclassMap
-# searchTimeLimit
-# bindTimeLimit
-# followReferrals
-# dereferenceAliases
-# profileTTL
-#
-# 2.3 Object Classes
-#
-# The following object class is defined in this document:
-#
-# DUAConfigProfile
-#
-#
+
attributeType ( DUAConfSchemaOID:1.0 NAME 'defaultServerList'
DESC 'Default LDAP server host address used by a DUA'
EQUALITY caseIgnoreMatch
@@ -239,14 +138,7 @@ attributeType ( DUAConfSchemaOID:1.15 NAME 'serviceAuthenticationMethod'
DESC 'Authentication method used by a service of the DUA'
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-#
-# 4. Class Definition
-#
-# The objectclass below is constructed from the attributes defined in
-# 3, with the exception of the cn attribute, which is defined in RFC
-# 2256 [8]. cn is used to represent the name of the DUA configura-
-# tion profile.
-#
+
objectClass ( DUAConfSchemaOID:2.5 NAME 'DUAConfigProfile'
SUP top STRUCTURAL
DESC 'Abstraction of a base configuration for a DUA'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git
More information about the Pkg-openldap-devel
mailing list