From: Arran Cudbard-Bell Date: Sat, 20 May 2023 04:15:24 +0000 (-0400) Subject: Fix tests to use split client definition X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=505459a106b9f8d04810bbcfc808f198b667ee36;p=thirdparty%2Ffreeradius-server.git Fix tests to use split client definition --- 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 caf5538a05c..4482fb96c8a 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 @@ -106,11 +106,12 @@ ldapsearch -LLL -H ldap://localhost -x -D cn=readonly,dc=example,dc=com -w reado ---- dn: freeradiusClientIdentifier=2.2.2.2,ou=clients,dc=example,dc=com objectClass: freeradiusClient +objectClass: radiusClient freeradiusClientIdentifier: 2.2.2.2 -freeradiusClientSecret: 123secret freeradiusClientShortname: client2 freeradiusClientType: cisco -freeradiusClientRequireMa: TRUE freeradiusClientComment: Another test client +radiusClientSecret: 123secret +radiusClientRequireMa: TRUE ---- ==== 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 9e1e51ebed8..344f3aae066 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 @@ -241,11 +241,12 @@ ldapsearch -LLL -H ldap://localhost -x -D cn=readonly,dc=example,dc=com -w reado ---- dn: freeradiusClientIdentifier=2.2.2.2,ou=clients,dc=example,dc=com objectClass: freeradiusClient +objectClass: radiusClient freeradiusClientIdentifier: 2.2.2.2 -freeradiusClientSecret: 123secret freeradiusClientShortname: client2 freeradiusClientType: cisco -freeradiusClientRequireMa: TRUE freeradiusClientComment: Another test client +radiusClientSecret: 123secret +radiusClientRequireMa: TRUE ---- ==== diff --git a/src/tests/salt-test-server/salt/ldap/base.ldif b/src/tests/salt-test-server/salt/ldap/base.ldif index 85512620f3e..2998caee4cb 100644 --- a/src/tests/salt-test-server/salt/ldap/base.ldif +++ b/src/tests/salt-test-server/salt/ldap/base.ldif @@ -160,21 +160,24 @@ ou: clients dn: freeradiusClientIdentifier=1.1.1.1,ou=clients,dc=example,dc=com objectClass: freeradiusClient +objectClass: radiusClient freeradiusClientIdentifier: 1.1.1.1 -freeradiusClientSecret: secret123 freeradiusClientShortname: client1 freeradiusClientType: other -freeradiusClientRequireMa: FALSE freeradiusClientComment: Test client +radiusClientSecret: secret123 +radiusClientRequireMa: FALSE dn: freeradiusClientIdentifier=2.2.2.2,ou=clients,dc=example,dc=com objectClass: freeradiusClient +objectClass: radiusClient freeradiusClientIdentifier: 2.2.2.2 -freeradiusClientSecret: 123secret + freeradiusClientShortname: client2 freeradiusClientType: cisco -freeradiusClientRequireMa: TRUE freeradiusClientComment: Another test client +radiusClientSecret: 123secret +radiusClientRequireMa: TRUE dn: dc=subdept,dc=example,dc=com objectClass: referral