From: Arran Cudbard-Bell Date: Fri, 19 May 2023 18:33:48 +0000 (-0400) Subject: s/radiusClient/freeradiusClient/g X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0e760b3dd69bc5fd08b15ad5e66c60de07f1fb5;p=thirdparty%2Ffreeradius-server.git s/radiusClient/freeradiusClient/g --- 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 4a6369285f8..caf5538a05c 100644 --- 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, -w -b '(&(objectClass=radiusClient)(radiusClientShortname=client2))' +ldapsearch -LLL -H ldap://localhost -x -D cn=readonly, -w -b '(&(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 435ed929096..9e1e51ebed8 100644 --- 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, -w -b '(&(objectClass=radiusClient)(radiusClientShortname=client2))' +ldapsearch -LLL -H ldap://localhost -x -D cn=readonly, -w -b '(&(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 72725371040..f216f9461ec 100644 --- 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 4d3809178e7..bfe3f955230 100644 --- 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 6f43e2fd8bd..85512620f3e 100644 --- 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