From c18e09729735dd7ff8b7d7bcd8a030270a6543f7 Mon Sep 17 00:00:00 2001 From: Ben Klang Date: Mon, 5 Dec 2005 00:54:32 +0000 Subject: [PATCH] Fix duplicated OID from partially committed earlier patch git-svn-id: https://svn.alkaloid.net/gpl/ldap2dns/trunk@122 06cd67b6-e706-0410-b29e-9de616bca6e9 --- dns.schema-2.0 | 6 +++--- dns.schema-2.2 | 35 +++++++++++++++++------------------ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dns.schema-2.0 b/dns.schema-2.0 index b8b06b7..28d2e59 100644 --- a/dns.schema-2.0 +++ b/dns.schema-2.0 @@ -105,19 +105,19 @@ attributetype ( 1.3.6.1.4.1.7222.1.4.23 SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{2} SINGLE-VALUE ) -attributetype ( 1.3.6.1.4.1.7222.1.4.23 +attributetype ( 1.3.6.1.4.1.7222.1.4.24 NAME 'dnssrvpriority' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attributetype ( 1.3.6.1.4.1.7222.1.4.24 +attributetype ( 1.3.6.1.4.1.7222.1.4.25 NAME 'dnssrvweight' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attributetype ( 1.3.6.1.4.1.7222.1.4.25 +attributetype ( 1.3.6.1.4.1.7222.1.4.26 NAME 'dnssrvport' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 diff --git a/dns.schema-2.2 b/dns.schema-2.2 index e415bc4..0ce813e 100644 --- a/dns.schema-2.2 +++ b/dns.schema-2.2 @@ -108,30 +108,29 @@ attributetype ( 1.3.6.1.4.1.7222.1.4.22 SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} ) -attributetype ( 1.3.6.1.4.1.7222.1.4.23 - NAME 'dnssrvpriority' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7222.1.4.24 - NAME 'dnssrvweight' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7222.1.4.25 - NAME 'dnssrvport' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE ) - attributetype ( 1.3.6.1.4.1.7222.1.4.23 NAME 'dnslocation' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{2} SINGLE-VALUE ) +attributetype ( 1.3.6.1.4.1.7222.1.4.24 + NAME 'dnssrvpriority' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.7222.1.4.25 + NAME 'dnssrvweight' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.7222.1.4.26 + NAME 'dnssrvport' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) objectclass ( 1.3.6.1.4.1.7222.1.4.19 NAME 'dnszone'