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 caf5538a05ce7e8e15e6aad044f7867fc5e4cfdc..4482fb96c8a9ce2d55f0a71d9e1930176955ce0c 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
@@ -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 9e1e51ebed821cb729ad9ae54591ce8ef91a57cd..344f3aae066832560fa0eb83a250d106428879b7 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
@@ -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 85512620f3e4ff5fbde701d6271adf556cd19e7e..2998caee4cbaf6a2a9fb73a2d50c257435b6419b 100644 (file)
--- 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