Invert name component order for LDAP DHCPv6 attributes

diff --git a/doc/schemas/ldap/openldap/freeradius-dhcpv4.ldif b/doc/schemas/ldap/openldap/freeradius-dhcpv4.ldif
index 92a11b04ebd3877a5d4678d66ed3a7a32659a7e3..38d5e5dea45d28bd7e24396dc0370d57d7498952 100644 (file)
--- a/doc/schemas/ldap/openldap/freeradius-dhcpv4.ldif
+++ b/doc/schemas/ldap/openldap/freeradius-dhcpv4.ldif
@@ -4,6 +4,6 @@ cn: freeradius-dhcpv4
 olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.2.1.1.1 NAME 'freeradiusDhcpv4GatewayIdentifier' DESC 'Usually Option 82 Remote ID' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.2.1.1.2 NAME 'freeradiusDhcpv4GatewayAddr' DESC 'Gateway IP address, usually GIADDR' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.2.1.1.3 NAME 'freeradiusDhcpv4PoolName' DESC 'DHCP IP pool name' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
-olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.2.2.1.4 NAME 'freeradiusDhcpv4Attribute' DESC 'DHCP attribute in format [<list>:]<attr> <op> <value>' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.2.2.1.4 NAME 'freeradiusDhcpv4Attribute' DESC 'DHCP attribute in format [<list>.]<attr> <op> <value>' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 olcObjectClasses: ( 1.3.6.1.4.1.11344.4.2.1.2.1 NAME 'freeradiusDhcpv4Gateway' DESC 'A DHCP gateway, and attributes specific to it' SUP top AUXILIARY MAY ( freeradiusDhcpv4GatewayIdentifier $ freeradiusDhcpv4GatewayAddr $ freeradiusDhcpv4PoolName ) )
 olcObjectClasses: ( 1.3.6.1.4.1.11344.4.2.2.2.2 NAME 'freeradiusDhcpv4Profile' SUP top AUXILIARY MAY ( freeradiusDhcpv4Attribute ) )

diff --git a/doc/schemas/ldap/openldap/freeradius-dhcpv4.schema b/doc/schemas/ldap/openldap/freeradius-dhcpv4.schema
index d7440dbc2799f59a6768c471f6730e7cf14eacba..46ffecb05f9580f03759542efffd6b105f717f3b 100644 (file)
--- a/doc/schemas/ldap/openldap/freeradius-dhcpv4.schema
+++ b/doc/schemas/ldap/openldap/freeradius-dhcpv4.schema
@@ -8,7 +8,7 @@
 #
 attributetype ( 1.3.6.1.4.1.11344.4.2.2.1.1
        NAME 'freeradiusDhcpv4Attribute'
-       DESC 'DHCP attribute in format [<list>:]<attr> <op> <value>'
+       DESC 'DHCP attribute in format [<list>.]<attr> <op> <value>'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15

diff --git a/doc/schemas/ldap/openldap/freeradius-dhcpv6.ldif b/doc/schemas/ldap/openldap/freeradius-dhcpv6.ldif
index 1716bf6670a8c0ce2e82081c7080af91bb12cac7..da01df81bd09fcabffbcf603cd955a42f55ecff1 100644 (file)
--- a/doc/schemas/ldap/openldap/freeradius-dhcpv6.ldif
+++ b/doc/schemas/ldap/openldap/freeradius-dhcpv6.ldif
@@ -3,9 +3,9 @@ objectClass: olcSchemaConfig
 cn: freeradius-dhcpv6
 olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.3.1.1.1 NAME 'freeradiusDhcpv6GatewayIdentifier' DESC 'Gateway Identifier' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.3.1.1.2 NAME 'freeradiusDhcpv6GatewayAddr' DESC 'Gateway IP address' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.3.1.1.3 NAME 'freeradiusDhcpv6NAPoolName' DESC 'DHCP IP NA pool name' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.3.1.1.4 NAME 'freeradiusDhcpv6PDPoolName' DESC 'DHCP IP PD pool name' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.3.1.1.5 NAME 'freeradiusDhcpv6TAPoolName' DESC 'DHCP IP TA pool name' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.3.2.1.6 NAME 'freeradiusDhcpv6Attribute' DESC 'DHCP attribute in format [<list>:]<attr> <op> <value>' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-olcObjectClasses: ( 1.3.6.1.4.1.11344.4.3.1.2.1 NAME 'freeradiusDhcpv6Gateway' DESC 'A DHCP gateway, and attributes specific to it' SUP top AUXILIARY MAY ( freeradiusDhcpv6GatewayIdentifier $ freeradiusDhcpv6GatewayAddr $ freeradiusDhcpv6NAPoolName $ freeradiusDhcpv6PDPoolName $ freeradiusDhcpv6TAPoolName ))
-olcObjectClasses: ( 1.3.6.1.4.1.11344.4.3.2.2.2 NAME 'freeradiusDhcpv6Profile' SUP top AUXILIARY MAY ( freeradiusDhcpv6Attribute ) )
+olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.3.1.1.3 NAME 'freeradiusDhcpv6PoolNameNA' DESC 'DHCPv6 IP NA pool name' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.3.1.1.4 NAME 'freeradiusDhcpv6PoolNamePD' DESC 'DHCPv6 IP PD pool name' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.3.1.1.5 NAME 'freeradiusDhcpv6PoolNameTA' DESC 'DHCPv6 IP TA pool name' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+olcAttributeTypes: ( 1.3.6.1.4.1.11344.4.3.2.1.1 NAME 'freeradiusDhcpv6Attribute' DESC 'DHCPv6 attribute in format [<list>.]<attr> <op> <value>' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+olcObjectClasses: ( 1.3.6.1.4.1.11344.4.3.1.2.1 NAME 'freeradiusDhcpv6Gateway' DESC 'A DHCP gateway, and attributes specific to it' SUP top AUXILIARY MAY ( freeradiusDhcpv6GatewayIdentifier $ freeradiusDhcpv6GatewayAddr $ freeradiusDhcpv6PoolNameNA $ freeradiusDhcpv6PoolNamePD $ freeradiusDhcpv6PoolNameTA ))
+olcObjectClasses: ( 1.3.6.1.4.1.11344.4.3.2.2.2 NAME 'freeradiusDhcpv6Profile' SUP top AUXILIARY MAY ( freeradiusDhcpv6Attribute ))

diff --git a/doc/schemas/ldap/openldap/freeradius-dhcpv6.schema b/doc/schemas/ldap/openldap/freeradius-dhcpv6.schema
index f087c42b318090b754e0ab1ff576c28b2d19ec5c..34cc6a78d25e76e062dd7fa6654e522a457b9956 100644 (file)
--- a/doc/schemas/ldap/openldap/freeradius-dhcpv6.schema
+++ b/doc/schemas/ldap/openldap/freeradius-dhcpv6.schema
@@ -8,7 +8,7 @@
 #
 attributetype ( 1.3.6.1.4.1.11344.4.3.2.1.1
        NAME 'freeradiusDhcpv6Attribute'
-       DESC 'DHCP attribute in format [<list>:]<attr> <op> <value>'
+       DESC 'DHCPv6 attribute in format [<list>.]<attr> <op> <value>'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
@@ -46,8 +46,8 @@ attributetype ( 1.3.6.1.4.1.11344.4.3.1.1.2
  )
 
 attributetype ( 1.3.6.1.4.1.11344.4.3.1.1.3
-       NAME 'freeradiusDhcpv6NAPoolName'
-       DESC 'DHCP ip pool name''
+       NAME 'freeradiusDhcpv6PoolNameNA'
+       DESC 'DHCPv6 IP NA pool name'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
@@ -55,8 +55,8 @@ attributetype ( 1.3.6.1.4.1.11344.4.3.1.1.3
  )
 
 attributetype ( 1.3.6.1.4.1.11344.4.3.1.1.4
-       NAME 'freeradiusDhcpv6PDPoolName'
-       DESC 'DHCP ip pool name''
+       NAME 'freeradiusDhcpv6PoolNamePD'
+       DESC 'DHCPv6 IP PD pool name'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
@@ -64,8 +64,8 @@ attributetype ( 1.3.6.1.4.1.11344.4.3.1.1.4
  )
 
 attributetype ( 1.3.6.1.4.1.11344.4.3.1.1.5
-       NAME 'freeradiusDhcpv6TAPoolName'
-       DESC 'DHCP ip pool name''
+       NAME 'freeradiusDhcpv6PoolNameTA'
+       DESC 'DHCPv6 IP TA pool name'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
@@ -76,5 +76,5 @@ objectclass ( 1.3.6.1.4.1.11344.4.3.1.2.1
        DESC 'A DHCP gateway, and attributes specific to it'
        SUP top
        AUXILIARY
-       MAY ( freeradiusDhcpv6GatewayIdentifier $ freeradiusDhcpv6GatewayAddr $ freeradiusDhcpv6PoolName )
+       MAY ( freeradiusDhcpv6GatewayIdentifier $ freeradiusDhcpv6GatewayAddr $ freeradiusDhcpv6PoolNameNA $ freeradiusDhcpv6PoolNamePD $ freeradiusDhcpv6PoolNameTA )
  )