]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
projects / thirdparty / freeradius-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3ff502d)
s/radiusClient/freeradiusClient/g
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Fri, 19 May 2023 18:33:48 +0000 (14:33 -0400)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Fri, 19 May 2023 18:33:52 +0000 (14:33 -0400)
doc/antora/modules/howto/pages/modules/ldap/bootstrap_openldap/docker.adoc patch | blob | blame | history
doc/antora/modules/howto/pages/modules/ldap/bootstrap_openldap/packages.adoc patch | blob | blame | history
doc/schemas/ldap/edir/freeradius-clients.ldif patch | blob | blame | history
src/tests/modules/ldap/xlat.unlang patch | blob | blame | history
src/tests/salt-test-server/salt/ldap/base.ldif patch | blob | blame | history

diff --git a/doc/antora/modules/howto/pages/modules/ldap/bootstrap_openldap/docker.adoc b/doc/antora/modules/howto/pages/modules/ldap/bootstrap_openldap/docker.adoc
index 4a6369285f895134b65d2333bc1dbaab396980d0..caf5538a05ce7e8e15e6aad044f7867fc5e4cfdc 100644 (file)
--- a/doc/antora/modules/howto/pages/modules/ldap/bootstrap_openldap/docker.adoc
+++ b/doc/antora/modules/howto/pages/modules/ldap/bootstrap_openldap/docker.adoc
@@ -85,32 +85,32 @@ instructions].
 As a final step you should verify that test data has been loaded correctly.
 This can be done using the `ldapsearch` utility using the LDAP read only user.
 
-The command below will retrieve the entry for one of the test `radiusClient`
+The command below will retrieve the entry for one of the test `freeradiusClient`
 entries. You should see a single search result returned if everything worked
 correctly.
 
 [source,shell]
 ----
-ldapsearch -LLL -H ldap://localhost -x -D cn=readonly,<base_dn> -w <readonly_password> -b <base_dn> '(&(objectClass=radiusClient)(radiusClientShortname=client2))'
+ldapsearch -LLL -H ldap://localhost -x -D cn=readonly,<base_dn> -w <readonly_password> -b <base_dn> '(&(objectClass=freeradiusClient)(freeradiusClientShortname=client2))'
 ----
 
 .Searching for a RADIUS Client
 ====
 [source,shell]
 ----
-ldapsearch -LLL -H ldap://localhost -x -D cn=readonly,dc=example,dc=com -w readonly -b dc=example,dc=com '(&(objectClass=radiusClient)(radiusClientShortname=client2))'
+ldapsearch -LLL -H ldap://localhost -x -D cn=readonly,dc=example,dc=com -w readonly -b dc=example,dc=com '(&(objectClass=freeradiusClient)(freeradiusClientShortname=client2))'
 ----
 
 .Expected output
 [source,ldif]
 ----
-dn: radiusClientIdentifier=2.2.2.2,ou=clients,dc=example,dc=com
-objectClass: radiusClient
-radiusClientIdentifier: 2.2.2.2
-radiusClientSecret: 123secret
-radiusClientShortname: client2
-radiusClientType: cisco
-radiusClientRequireMa: TRUE
-radiusClientComment: Another test client
+dn: freeradiusClientIdentifier=2.2.2.2,ou=clients,dc=example,dc=com
+objectClass: freeradiusClient
+freeradiusClientIdentifier: 2.2.2.2
+freeradiusClientSecret: 123secret
+freeradiusClientShortname: client2
+freeradiusClientType: cisco
+freeradiusClientRequireMa: TRUE
+freeradiusClientComment: Another test client
 ----
 ====
diff --git a/doc/antora/modules/howto/pages/modules/ldap/bootstrap_openldap/packages.adoc b/doc/antora/modules/howto/pages/modules/ldap/bootstrap_openldap/packages.adoc
index 435ed92909660e92fe0e6f4ab2a3b5b628a1ba14..9e1e51ebed821cb729ad9ae54591ce8ef91a57cd 100644 (file)
--- a/doc/antora/modules/howto/pages/modules/ldap/bootstrap_openldap/packages.adoc
+++ b/doc/antora/modules/howto/pages/modules/ldap/bootstrap_openldap/packages.adoc
@@ -220,32 +220,32 @@ with the `-Y EXTERNAL` argument.
 As a final step you should verify that test data has been loaded correctly.
 This can be done using the `ldapsearch` utility using the LDAP read only user.
 
-The command below will retrieve the entry for one of the test `radiusClient`
+The command below will retrieve the entry for one of the test `freeradiusClient`
 entries. You should see a single search result returned if everything worked
 correctly.
 
 [source,shell]
 ----
-ldapsearch -LLL -H ldap://localhost -x -D cn=readonly,<base_dn> -w <readonly_password> -b <base_dn> '(&(objectClass=radiusClient)(radiusClientShortname=client2))'
+ldapsearch -LLL -H ldap://localhost -x -D cn=readonly,<base_dn> -w <readonly_password> -b <base_dn> '(&(objectClass=freeradiusClient)(freeradiusClientShortname=client2))'
 ----
 
 .Searching for a RADIUS Client
 ====
 [source,shell]
 ----
-ldapsearch -LLL -H ldap://localhost -x -D cn=readonly,dc=example,dc=com -w readonly -b dc=example,dc=com '(&(objectClass=radiusClient)(radiusClientShortname=client2))'
+ldapsearch -LLL -H ldap://localhost -x -D cn=readonly,dc=example,dc=com -w readonly -b dc=example,dc=com '(&(objectClass=freeradiusClient)(freeradiusClientShortname=client2))'
 ----
 
 .Expected output
 [source,ldif]
 ----
-dn: radiusClientIdentifier=2.2.2.2,ou=clients,dc=example,dc=com
-objectClass: radiusClient
-radiusClientIdentifier: 2.2.2.2
-radiusClientSecret: 123secret
-radiusClientShortname: client2
-radiusClientType: cisco
-radiusClientRequireMa: TRUE
-radiusClientComment: Another test client
+dn: freeradiusClientIdentifier=2.2.2.2,ou=clients,dc=example,dc=com
+objectClass: freeradiusClient
+freeradiusClientIdentifier: 2.2.2.2
+freeradiusClientSecret: 123secret
+freeradiusClientShortname: client2
+freeradiusClientType: cisco
+freeradiusClientRequireMa: TRUE
+freeradiusClientComment: Another test client
 ----
 ====
diff --git a/doc/schemas/ldap/edir/freeradius-clients.ldif b/doc/schemas/ldap/edir/freeradius-clients.ldif
index 72725371040bbf6a8ba59224ce6091b380b7e8eb..f216f9461ec2b6f5e3c5a7dcb0bf2b19621f159f 100644 (file)
--- a/doc/schemas/ldap/edir/freeradius-clients.ldif
+++ b/doc/schemas/ldap/edir/freeradius-clients.ldif
@@ -10,48 +10,48 @@ dn: cn=schema
 changetype: modify
 add: attributetypes
 attributetypes: ( 1.3.6.1.4.1.11344.4.1.1.2.1
- NAME 'radiusClientIdentifier'
+ NAME 'freeradiusClientIdentifier'
  DESC 'Client Identifier'
  EQUALITY caseIgnoreMatch
  SUBSTR caseIgnoreSubstringsMatch
  SYNTAX '1.3.6.1.4.1.1466.115.121.1.15'
  SINGLE-VALUE )
 attributetypes: ( 1.3.6.1.4.1.11344.4.1.1.2.2
- NAME 'radiusClientSecret'
+ NAME 'freeradiusClientSecret'
  DESC 'Client Secret'
  EQUALITY caseIgnoreMatch
  SUBSTR caseIgnoreSubstringsMatch
  SYNTAX '1.3.6.1.4.1.1466.115.121.1.15'
  SINGLE-VALUE )
 attributetypes: ( 1.3.6.1.4.1.11344.4.1.1.2.3
- NAME 'radiusClientShortname'
+ NAME 'freeradiusClientShortname'
  DESC 'Client Shortname'
  EQUALITY caseIgnoreMatch
  SUBSTR caseIgnoreSubstringsMatch
  SYNTAX '1.3.6.1.4.1.1466.115.121.1.15'
  SINGLE-VALUE )
 attributetypes: ( 1.3.6.1.4.1.11344.4.1.1.2.4
- NAME 'radiusClientVirtualServer'
+ NAME 'freeradiusClientVirtualServer'
  DESC 'VirtualServer'
  EQUALITY caseIgnoreMatch
  SUBSTR caseIgnoreSubstringsMatch
  SYNTAX '1.3.6.1.4.1.1466.115.121.1.15'
  SINGLE-VALUE )
 attributetypes: ( 1.3.6.1.4.1.11344.4.1.1.2.5
- NAME 'radiusClientType'
+ NAME 'freeradiusClientType'
  DESC 'Client Type'
  EQUALITY caseIgnoreMatch
  SUBSTR caseIgnoreSubstringsMatch
  SYNTAX '1.3.6.1.4.1.1466.115.121.1.15'
  SINGLE-VALUE )
 attributetypes: ( 1.3.6.1.4.1.11344.4.1.1.2.6
- NAME 'radiusClientRequireMa'
+ NAME 'freeradiusClientRequireMa'
  DESC 'Require Message Authenticator'
  EQUALITY booleanMatch
  SYNTAX '1.3.6.1.4.1.1466.115.121.1.7'
  SINGLE-VALUE )
 attributetypes: ( 1.3.6.1.4.1.11344.4.1.1.2.7
- NAME 'radiusClientComment'
+ NAME 'freeradiusClientComment'
  DESC 'Client comment'
  EQUALITY caseIgnoreMatch
  SYNTAX '1.3.6.1.4.1.1466.115.121.1.15'
@@ -62,8 +62,8 @@ dn: cn=schema
 changetype: modify
 add: objectclasses
 objectclasses: ( 1.3.6.1.4.1.11344.4.1.1.1.1
- NAME 'radiusClient'
- DESC 'radiusClient object class'
+ NAME 'freeradiusClient'
+ DESC 'freeradiusClient object class'
  SUP top STRUCTURAL
- MUST ( radiusClientIdentifier $ radiusClientSecret )
- MAY ( radiusClientShortname $ radiusClientVirtualServer $ radiusClientType $ radiusClientRequireMa $radiusClientcomment ))
+ MUST ( freeradiusClientIdentifier $ freeradiusClientSecret )
+ MAY ( freeradiusClientShortname $ freeradiusClientVirtualServer $ freeradiusClientType $ freeradiusClientRequireMa $freeradiusClientcomment ))
diff --git a/src/tests/modules/ldap/xlat.unlang b/src/tests/modules/ldap/xlat.unlang
index 4d3809178e7b8b77e6eb8c31332d6a28064f63f8..bfe3f955230416acdcb3ce529c14ce2bcd4a04f7 100644 (file)
--- a/src/tests/modules/ldap/xlat.unlang
+++ b/src/tests/modules/ldap/xlat.unlang
@@ -52,7 +52,7 @@ if (!(&Tmp-String-6 == "John Doe")) {
 }
 
 # Return multiple values - could be in any sequence
-&Tmp-String-7 := "%{ldap:ldap://$ENV{LDAP_TEST_SERVER}:$ENV{LDAP_TEST_SERVER_PORT}/ou=clients,dc=example,dc=com?radiusClientIdentifier?sub?(objectClass=radiusClient)}"
+&Tmp-String-7 := "%{ldap:ldap://$ENV{LDAP_TEST_SERVER}:$ENV{LDAP_TEST_SERVER_PORT}/ou=clients,dc=example,dc=com?freeradiusClientIdentifier?sub?(objectClass=freeradiusClient)}"
 
 if (!(&Tmp-String-7 == "1.1.1.12.2.2.2") && !(&Tmp-String-7 == "2.2.2.21.1.1.1")) {
         test_fail
diff --git a/src/tests/salt-test-server/salt/ldap/base.ldif b/src/tests/salt-test-server/salt/ldap/base.ldif
index 6f43e2fd8bdcfbc041b26b52ae499e458122e53b..85512620f3e4ff5fbde701d6271adf556cd19e7e 100644 (file)
--- a/src/tests/salt-test-server/salt/ldap/base.ldif
+++ b/src/tests/salt-test-server/salt/ldap/base.ldif
@@ -158,23 +158,23 @@ dn: ou=clients,dc=example,dc=com
 objectClass: organizationalUnit
 ou: clients
 
-dn: radiusClientIdentifier=1.1.1.1,ou=clients,dc=example,dc=com
-objectClass: radiusClient
-radiusClientIdentifier: 1.1.1.1
-radiusClientSecret: secret123
-radiusClientShortname: client1
-radiusClientType: other
-radiusClientRequireMa: FALSE
-radiusClientComment: Test client
-
-dn: radiusClientIdentifier=2.2.2.2,ou=clients,dc=example,dc=com
-objectClass: radiusClient
-radiusClientIdentifier: 2.2.2.2
-radiusClientSecret: 123secret
-radiusClientShortname: client2
-radiusClientType: cisco
-radiusClientRequireMa: TRUE
-radiusClientComment: Another test client
+dn: freeradiusClientIdentifier=1.1.1.1,ou=clients,dc=example,dc=com
+objectClass: freeradiusClient
+freeradiusClientIdentifier: 1.1.1.1
+freeradiusClientSecret: secret123
+freeradiusClientShortname: client1
+freeradiusClientType: other
+freeradiusClientRequireMa: FALSE
+freeradiusClientComment: Test client
+
+dn: freeradiusClientIdentifier=2.2.2.2,ou=clients,dc=example,dc=com
+objectClass: freeradiusClient
+freeradiusClientIdentifier: 2.2.2.2
+freeradiusClientSecret: 123secret
+freeradiusClientShortname: client2
+freeradiusClientType: cisco
+freeradiusClientRequireMa: TRUE
+freeradiusClientComment: Another test client
 
 dn: dc=subdept,dc=example,dc=com
 objectClass: referral
Mirror of https://github.com/FreeRADIUS/freeradius-server.git