diff options
-rw-r--r-- | install/share/bootstrap-template.ldif | 42 | ||||
-rw-r--r-- | install/static/test/data/hbacsvc_add.json | 2 | ||||
-rw-r--r-- | install/static/test/data/hbacsvc_find.json | 20 | ||||
-rw-r--r-- | install/static/test/data/hbacsvc_show.json | 4 | ||||
-rw-r--r-- | install/static/test/data/hbacsvcgroup_add.json | 2 | ||||
-rw-r--r-- | install/static/test/data/hbacsvcgroup_add_member.json | 2 | ||||
-rw-r--r-- | install/static/test/data/hbacsvcgroup_find.json | 2 | ||||
-rw-r--r-- | install/static/test/data/hbacsvcgroup_member_hbacsvc.json | 8 | ||||
-rw-r--r-- | install/static/test/data/hbacsvcgroup_remove_member.json | 2 | ||||
-rw-r--r-- | install/static/test/data/hbacsvcgroup_show.json | 2 | ||||
-rw-r--r-- | install/static/test/data/ipa_init.json | 8 | ||||
-rw-r--r-- | install/static/test/data/json_metadata.json | 4 | ||||
-rw-r--r-- | ipalib/constants.py | 4 | ||||
-rw-r--r-- | tests/test_xmlrpc/test_hbacsvcgroup_plugin.py | 4 |
14 files changed, 53 insertions, 53 deletions
diff --git a/install/share/bootstrap-template.ldif b/install/share/bootstrap-template.ldif index 333930a63..dc1f8cbea 100644 --- a/install/share/bootstrap-template.ldif +++ b/install/share/bootstrap-template.ldif @@ -70,13 +70,19 @@ objectClass: automount automountKey: /- automountInformation: auto.direct -dn: cn=hbacservices,cn=accounts,$SUFFIX +dn: cn=hbac,$SUFFIX +changetype: add +objectClass: top +objectClass: nsContainer +cn: hbac + +dn: cn=hbacservices,cn=hbac,$SUFFIX changetype: add objectClass: top objectClass: nsContainer cn: hbacservices -dn: cn=hbacservicegroups,cn=accounts,$SUFFIX +dn: cn=hbacservicegroups,cn=hbac,$SUFFIX changetype: add objectClass: top objectClass: nsContainer @@ -106,12 +112,6 @@ objectClass: top objectClass: nsContainer cn: sudorules -dn: cn=hbac,$SUFFIX -changetype: add -objectClass: top -objectClass: nsContainer -cn: hbac - dn: cn=etc,$SUFFIX changetype: add objectClass: nsContainer @@ -208,7 +208,7 @@ gidNumber: eval($IDSTART+2) description: Limited admins who can edit other users cn: editors -dn: cn=sshd,cn=hbacservices,cn=accounts,$SUFFIX +dn: cn=sshd,cn=hbacservices,cn=hbac,$SUFFIX changetype: add objectclass: ipahbacservice objectclass: ipaobject @@ -216,7 +216,7 @@ cn: sshd description: sshd ipauniqueid:autogenerate -dn: cn=ftp,cn=hbacservices,cn=accounts,$SUFFIX +dn: cn=ftp,cn=hbacservices,cn=hbac,$SUFFIX changetype: add objectclass: ipahbacservice objectclass: ipaobject @@ -224,7 +224,7 @@ cn: ftp description: ftp ipauniqueid:autogenerate -dn: cn=su,cn=hbacservices,cn=accounts,$SUFFIX +dn: cn=su,cn=hbacservices,cn=hbac,$SUFFIX changetype: add objectclass: ipahbacservice objectclass: ipaobject @@ -232,7 +232,7 @@ cn: su description: su ipauniqueid:autogenerate -dn: cn=login,cn=hbacservices,cn=accounts,$SUFFIX +dn: cn=login,cn=hbacservices,cn=hbac,$SUFFIX changetype: add objectclass: ipahbacservice objectclass: ipaobject @@ -240,7 +240,7 @@ cn: login description: login ipauniqueid:autogenerate -dn: cn=su-l,cn=hbacservices,cn=accounts,$SUFFIX +dn: cn=su-l,cn=hbacservices,cn=hbac,$SUFFIX changetype: add objectclass: ipahbacservice objectclass: ipaobject @@ -248,7 +248,7 @@ cn: su-l description: su with login shell ipauniqueid:autogenerate -dn: cn=sudo,cn=hbacservices,cn=accounts,$SUFFIX +dn: cn=sudo,cn=hbacservices,cn=hbac,$SUFFIX changetype: add objectclass: ipahbacservice objectclass: ipaobject @@ -256,7 +256,7 @@ cn: sudo description: sudo ipauniqueid:autogenerate -dn: cn=sudo-i,cn=hbacservices,cn=accounts,$SUFFIX +dn: cn=sudo-i,cn=hbacservices,cn=hbac,$SUFFIX changetype: add objectclass: ipahbacservice objectclass: ipaobject @@ -264,7 +264,7 @@ cn: sudo-i description: sudo-i ipauniqueid:autogenerate -dn: cn=gdm,cn=hbacservices,cn=accounts,$SUFFIX +dn: cn=gdm,cn=hbacservices,cn=hbac,$SUFFIX changetype: add objectclass: ipahbacservice objectclass: ipaobject @@ -272,7 +272,7 @@ cn: gdm description: gdm ipauniqueid:autogenerate -dn: cn=gdm-password,cn=hbacservices,cn=accounts,$SUFFIX +dn: cn=gdm-password,cn=hbacservices,cn=hbac,$SUFFIX changetype: add objectclass: ipahbacservice objectclass: ipaobject @@ -280,7 +280,7 @@ cn: gdm-password description: gdm-password ipauniqueid:autogenerate -dn: cn=kdm,cn=hbacservices,cn=accounts,$SUFFIX +dn: cn=kdm,cn=hbacservices,cn=hbac,$SUFFIX changetype: add objectclass: ipahbacservice objectclass: ipaobject @@ -288,7 +288,7 @@ cn: kdm description: kdm ipauniqueid:autogenerate -dn: cn=SUDO,cn=hbacservicegroups,cn=accounts,$SUFFIX +dn: cn=SUDO,cn=hbacservicegroups,cn=hbac,$SUFFIX changetype: add objectClass: ipaobject objectClass: ipahbacservicegroup @@ -298,8 +298,8 @@ objectClass: top cn: SUDO ipauniqueid:autogenerate description: Default group of SUDO related services -member: cn=sudo,cn=hbacservices,cn=accounts,$SUFFIX -member: cn=sudo-i,cn=hbacservices,cn=accounts,$SUFFIX +member: cn=sudo,cn=hbacservices,cn=hbac,$SUFFIX +member: cn=sudo-i,cn=hbacservices,cn=hbac,$SUFFIX dn: cn=ipaConfig,cn=etc,$SUFFIX changetype: add diff --git a/install/static/test/data/hbacsvc_add.json b/install/static/test/data/hbacsvc_add.json index 35da07a6e..87eb51d78 100644 --- a/install/static/test/data/hbacsvc_add.json +++ b/install/static/test/data/hbacsvc_add.json @@ -9,7 +9,7 @@ "description": [ "Test Service" ], - "dn": "cn=test,cn=hbacservices,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=test,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com", "ipauniqueid": [ "c3302e82-ecfd11df-b3f78f4b-11cc007b" ], diff --git a/install/static/test/data/hbacsvc_find.json b/install/static/test/data/hbacsvc_find.json index 09373a338..86a9bcaa5 100644 --- a/install/static/test/data/hbacsvc_find.json +++ b/install/static/test/data/hbacsvc_find.json @@ -11,7 +11,7 @@ "description": [ "sshd" ], - "dn": "cn=sshd,cn=hbacservices,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=sshd,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" }, { "cn": [ @@ -20,7 +20,7 @@ "description": [ "ftp" ], - "dn": "cn=ftp,cn=hbacservices,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=ftp,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" }, { "cn": [ @@ -29,7 +29,7 @@ "description": [ "su" ], - "dn": "cn=su,cn=hbacservices,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=su,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" }, { "cn": [ @@ -38,7 +38,7 @@ "description": [ "login" ], - "dn": "cn=login,cn=hbacservices,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=login,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" }, { "cn": [ @@ -47,7 +47,7 @@ "description": [ "su with login shell" ], - "dn": "cn=su-l,cn=hbacservices,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=su-l,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" }, { "cn": [ @@ -56,7 +56,7 @@ "description": [ "sudo" ], - "dn": "cn=sudo,cn=hbacservices,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=sudo,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" }, { "cn": [ @@ -65,7 +65,7 @@ "description": [ "sudo-i" ], - "dn": "cn=sudo-i,cn=hbacservices,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=sudo-i,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" }, { "cn": [ @@ -74,7 +74,7 @@ "description": [ "gdm" ], - "dn": "cn=gdm,cn=hbacservices,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=gdm,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" }, { "cn": [ @@ -83,7 +83,7 @@ "description": [ "gdm-password" ], - "dn": "cn=gdm-password,cn=hbacservices,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=gdm-password,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" }, { "cn": [ @@ -92,7 +92,7 @@ "description": [ "kdm" ], - "dn": "cn=kdm,cn=hbacservices,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=kdm,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com" } ], "summary": null, diff --git a/install/static/test/data/hbacsvc_show.json b/install/static/test/data/hbacsvc_show.json index 8047964e0..8ebfbd7c1 100644 --- a/install/static/test/data/hbacsvc_show.json +++ b/install/static/test/data/hbacsvc_show.json @@ -17,12 +17,12 @@ "description": [ "sudo" ], - "dn": "cn=sudo,cn=hbacservices,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=sudo,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com", "ipauniqueid": [ "676e92a1-ec7611df-b3f78f4b-11cc007b" ], "memberof": [ - "cn=SUDO,cn=hbacservicegroups,cn=accounts,dc=dev,dc=example,dc=com" + "cn=SUDO,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com" ], "objectclass": [ "ipahbacservice", diff --git a/install/static/test/data/hbacsvcgroup_add.json b/install/static/test/data/hbacsvcgroup_add.json index b0827f59b..0dd1e96fe 100644 --- a/install/static/test/data/hbacsvcgroup_add.json +++ b/install/static/test/data/hbacsvcgroup_add.json @@ -9,7 +9,7 @@ "description": [ "Test Service Group" ], - "dn": "cn=test,cn=hbacservicegroups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=test,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com", "ipauniqueid": [ "0ab6ba82-ecfe11df-b3f78f4b-11cc007b" ], diff --git a/install/static/test/data/hbacsvcgroup_add_member.json b/install/static/test/data/hbacsvcgroup_add_member.json index 6c16a1dde..8526e1848 100644 --- a/install/static/test/data/hbacsvcgroup_add_member.json +++ b/install/static/test/data/hbacsvcgroup_add_member.json @@ -15,7 +15,7 @@ "description": [ "Test Service Group" ], - "dn": "cn=test,cn=hbacservicegroups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=test,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com", "member_hbacsvc": [ "test" ] diff --git a/install/static/test/data/hbacsvcgroup_find.json b/install/static/test/data/hbacsvcgroup_find.json index b6a669009..797530e37 100644 --- a/install/static/test/data/hbacsvcgroup_find.json +++ b/install/static/test/data/hbacsvcgroup_find.json @@ -11,7 +11,7 @@ "description": [ "Default group of SUDO related services" ], - "dn": "cn=sudo,cn=hbacservicegroups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=sudo,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com", "member_hbacsvc": [ "sudo", "sudo-i" diff --git a/install/static/test/data/hbacsvcgroup_member_hbacsvc.json b/install/static/test/data/hbacsvcgroup_member_hbacsvc.json index 9819a2f26..a407a622f 100644 --- a/install/static/test/data/hbacsvcgroup_member_hbacsvc.json +++ b/install/static/test/data/hbacsvcgroup_member_hbacsvc.json @@ -13,12 +13,12 @@ "description": [ "sudo" ], - "dn": "cn=sudo,cn=hbacservices,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=sudo,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com", "ipauniqueid": [ "42927a86-f46d-11df-8cc1-00163e72f2d9" ], "memberof": [ - "cn=SUDO,cn=hbacservicegroups,cn=accounts,dc=dev,dc=example,dc=com" + "cn=SUDO,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com" ], "objectclass": [ "ipahbacservice", @@ -37,12 +37,12 @@ "description": [ "sudo-i" ], - "dn": "cn=sudo-i,cn=hbacservices,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=sudo-i,cn=hbacservices,cn=hbac,dc=dev,dc=example,dc=com", "ipauniqueid": [ "42970a6a-f46d-11df-8cc1-00163e72f2d9" ], "memberof": [ - "cn=SUDO,cn=hbacservicegroups,cn=accounts,dc=dev,dc=example,dc=com" + "cn=SUDO,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com" ], "objectclass": [ "ipahbacservice", diff --git a/install/static/test/data/hbacsvcgroup_remove_member.json b/install/static/test/data/hbacsvcgroup_remove_member.json index fc298e42f..cdf413789 100644 --- a/install/static/test/data/hbacsvcgroup_remove_member.json +++ b/install/static/test/data/hbacsvcgroup_remove_member.json @@ -15,7 +15,7 @@ "description": [ "Test Service Group" ], - "dn": "cn=test,cn=hbacservicegroups,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=test,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com" } } } diff --git a/install/static/test/data/hbacsvcgroup_show.json b/install/static/test/data/hbacsvcgroup_show.json index 707445745..ad3c4253b 100644 --- a/install/static/test/data/hbacsvcgroup_show.json +++ b/install/static/test/data/hbacsvcgroup_show.json @@ -24,7 +24,7 @@ "description": [ "Default group of SUDO related services" ], - "dn": "cn=sudo,cn=hbacservicegroups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=sudo,cn=hbacservicegroups,cn=hbac,dc=dev,dc=example,dc=com", "ipauniqueid": [ "676e92ab-ec7611df-b3f78f4b-11cc007b" ], diff --git a/install/static/test/data/ipa_init.json b/install/static/test/data/ipa_init.json index a45cb3fc3..e0e6053c4 100644 --- a/install/static/test/data/ipa_init.json +++ b/install/static/test/data/ipa_init.json @@ -3604,7 +3604,7 @@ ], "attribute_members": {}, "bindable": false, - "container_dn": "cn=hbacservices,cn=accounts", + "container_dn": "cn=hbacservices,cn=hbac", "default_attributes": [ "cn", "description", @@ -3725,7 +3725,7 @@ ] }, "bindable": false, - "container_dn": "cn=hbacservicegroups,cn=accounts", + "container_dn": "cn=hbacservicegroups,cn=hbac", "default_attributes": [ "cn", "description", @@ -7827,8 +7827,8 @@ "container_dns": "cn=dns", "container_group": "cn=groups,cn=accounts", "container_hbac": "cn=hbac", - "container_hbacservice": "cn=hbacservices,cn=accounts", - "container_hbacservicegroup": "cn=hbacservicegroups,cn=accounts", + "container_hbacservice": "cn=hbacservices,cn=hbac", + "container_hbacservicegroup": "cn=hbacservicegroups,cn=hbac", "container_host": "cn=computers,cn=accounts", "container_hostgroup": "cn=hostgroups,cn=accounts", "container_netgroup": "cn=ng,cn=alt", diff --git a/install/static/test/data/json_metadata.json b/install/static/test/data/json_metadata.json index 2e81bee58..222a8b65c 100644 --- a/install/static/test/data/json_metadata.json +++ b/install/static/test/data/json_metadata.json @@ -1624,7 +1624,7 @@ }, "hbacsvc": { "attribute_members": {}, - "container_dn": "cn=hbacservices,cn=accounts", + "container_dn": "cn=hbacservices,cn=hbac", "default_attributes": [ "cn", "description", @@ -1713,7 +1713,7 @@ "hbacsvc" ] }, - "container_dn": "cn=hbacservicegroups,cn=accounts", + "container_dn": "cn=hbacservicegroups,cn=hbac", "default_attributes": [ "cn", "description", diff --git a/ipalib/constants.py b/ipalib/constants.py index 961b4e43c..2d539fea7 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -96,8 +96,8 @@ DEFAULT_CONFIG = ( ('container_policylinks', 'cn=policylinks,cn=configs,cn=policies'), ('container_netgroup', 'cn=ng,cn=alt'), ('container_hbac', 'cn=hbac'), - ('container_hbacservice', 'cn=hbacservices,cn=accounts'), - ('container_hbacservicegroup', 'cn=hbacservicegroups,cn=accounts'), + ('container_hbacservice', 'cn=hbacservices,cn=hbac'), + ('container_hbacservicegroup', 'cn=hbacservicegroups,cn=hbac'), ('container_dns', 'cn=dns'), ('container_virtual', 'cn=virtual operations,cn=etc'), ('container_sudorule', 'cn=sudorules,cn=sudo'), diff --git a/tests/test_xmlrpc/test_hbacsvcgroup_plugin.py b/tests/test_xmlrpc/test_hbacsvcgroup_plugin.py index 25b8f9fd2..c5c02f11c 100644 --- a/tests/test_xmlrpc/test_hbacsvcgroup_plugin.py +++ b/tests/test_xmlrpc/test_hbacsvcgroup_plugin.py @@ -26,10 +26,10 @@ from tests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid from tests.test_xmlrpc import objectclasses hbacsvcgroup1 = u'testhbacsvcgroup1' -dn1 = u'cn=%s,cn=hbacservicegroups,cn=accounts,%s' % (hbacsvcgroup1, api.env.basedn) +dn1 = u'cn=%s,cn=hbacservicegroups,cn=hbac,%s' % (hbacsvcgroup1, api.env.basedn) hbacsvc1 = u'sshd' -hbacsvc_dn1 = u'cn=%s,cn=hbacservices,cn=accounts,%s' % (hbacsvc1, api.env.basedn) +hbacsvc_dn1 = u'cn=%s,cn=hbacservices,cn=hbac,%s' % (hbacsvc1, api.env.basedn) class test_hbacsvcgroup(Declarative): |