diff options
author | Simo Sorce <ssorce@redhat.com> | 2011-01-14 15:27:56 -0500 |
---|---|---|
committer | Simo Sorce <ssorce@redhat.com> | 2011-01-17 11:46:45 -0500 |
commit | 25cfddcbe15932a2b6433e6e868085c3e7b6ef52 (patch) | |
tree | 5b967e72256f12962ef8462dc6fdae41140d9ef3 /install | |
parent | fb1f9ecf9ffa615653ac0fc62c84e27851835a6d (diff) | |
download | freeipa-25cfddcbe15932a2b6433e6e868085c3e7b6ef52.tar.gz freeipa-25cfddcbe15932a2b6433e6e868085c3e7b6ef52.tar.xz freeipa-25cfddcbe15932a2b6433e6e868085c3e7b6ef52.zip |
Move sudo related data all under cn=sudo
Fixes: https://fedorahosted.org/freeipa/ticket/773
Diffstat (limited to 'install')
19 files changed, 49 insertions, 43 deletions
diff --git a/install/share/bootstrap-template.ldif b/install/share/bootstrap-template.ldif index afff807fb..333930a63 100644 --- a/install/share/bootstrap-template.ldif +++ b/install/share/bootstrap-template.ldif @@ -82,29 +82,35 @@ objectClass: top objectClass: nsContainer cn: hbacservicegroups -dn: cn=sudocmds,cn=accounts,$SUFFIX +dn: cn=sudo,$SUFFIX +changetype: add +objectClass: top +objectClass: nsContainer +cn: sudo + +dn: cn=sudocmds,cn=sudo,$SUFFIX changetype: add objectClass: top objectClass: nsContainer cn: sudocmds -dn: cn=sudocmdgroups,cn=accounts,$SUFFIX +dn: cn=sudocmdgroups,cn=sudo,$SUFFIX changetype: add objectClass: top objectClass: nsContainer cn: sudocmdgroups -dn: cn=hbac,$SUFFIX +dn: cn=sudorules,cn=sudo,$SUFFIX changetype: add objectClass: top objectClass: nsContainer -cn: hbac +cn: sudorules -dn: cn=sudorules,$SUFFIX +dn: cn=hbac,$SUFFIX changetype: add objectClass: top objectClass: nsContainer -cn: sudorules +cn: hbac dn: cn=etc,$SUFFIX changetype: add diff --git a/install/share/schema_compat.uldif b/install/share/schema_compat.uldif index b7ee05fa0..ac4b7b775 100644 --- a/install/share/schema_compat.uldif +++ b/install/share/schema_compat.uldif @@ -67,7 +67,7 @@ add:objectClass: top add:objectClass: extensibleObject add:cn: sudoers add:schema-compat-container-group: 'ou=SUDOers, $SUFFIX' -add:schema-compat-search-base: 'cn=sudorules, $SUFFIX' +add:schema-compat-search-base: 'cn=sudorules, cn=sudo, $SUFFIX' add:schema-compat-search-filter: (&(objectclass=ipaSudoRule)(!(compatVisible=FALSE))(!(ipaEnabledFlag=FALSE))) add:schema-compat-entry-rdn: cn=%{cn} add:schema-compat-entry-attribute: objectclass=sudoRole diff --git a/install/static/test/data/ipa_init.json b/install/static/test/data/ipa_init.json index fdd5dbcdd..a45cb3fc3 100644 --- a/install/static/test/data/ipa_init.json +++ b/install/static/test/data/ipa_init.json @@ -5865,7 +5865,7 @@ ], "attribute_members": {}, "bindable": false, - "container_dn": "cn=sudocmds,cn=accounts", + "container_dn": "cn=sudocmds,cn=sudo", "default_attributes": [ "sudocmd", "description" @@ -5993,7 +5993,7 @@ ] }, "bindable": false, - "container_dn": "cn=sudocmdgroups,cn=accounts", + "container_dn": "cn=sudocmdgroups,cn=sudo", "default_attributes": [ "cn", "description", @@ -6209,7 +6209,7 @@ ] }, "bindable": false, - "container_dn": "cn=sudorules", + "container_dn": "cn=sudorules,cn=sudo", "default_attributes": [ "cn", "ipaenabledflag", @@ -7840,9 +7840,9 @@ "container_rolegroup": "cn=roles,cn=accounts", "container_roles": "cn=roles,cn=policies", "container_service": "cn=services,cn=accounts", - "container_sudocmd": "cn=sudocmds,cn=accounts", - "container_sudocmdgroup": "cn=sudocmdgroups,cn=accounts", - "container_sudorule": "cn=sudorules", + "container_sudocmd": "cn=sudocmds,cn=sudo", + "container_sudocmdgroup": "cn=sudocmdgroups,cn=sudo", + "container_sudorule": "cn=sudorules,cn=sudo", "container_user": "cn=users,cn=accounts", "container_virtual": "cn=virtual operations,cn=etc", "context": "server", diff --git a/install/static/test/data/json_metadata.json b/install/static/test/data/json_metadata.json index 4ebe489cf..2e81bee58 100644 --- a/install/static/test/data/json_metadata.json +++ b/install/static/test/data/json_metadata.json @@ -2959,7 +2959,7 @@ }, "sudocmd": { "attribute_members": {}, - "container_dn": "cn=sudocmds,cn=accounts", + "container_dn": "cn=sudocmds,cn=sudo", "default_attributes": [ "sudocmd", "description" @@ -3055,7 +3055,7 @@ "sudocmdgroup" ] }, - "container_dn": "cn=sudocmdgroups,cn=accounts", + "container_dn": "cn=sudocmdgroups,cn=sudo", "default_attributes": [ "cn", "description", @@ -3219,7 +3219,7 @@ "group" ] }, - "container_dn": "cn=sudorules", + "container_dn": "cn=sudorules,cn=sudo", "default_attributes": [ "cn", "description" @@ -4094,4 +4094,4 @@ } } } -}
\ No newline at end of file +} diff --git a/install/static/test/data/sudocmd_add.json b/install/static/test/data/sudocmd_add.json index 6de1def49..6fb4a5fc1 100644 --- a/install/static/test/data/sudocmd_add.json +++ b/install/static/test/data/sudocmd_add.json @@ -3,7 +3,7 @@ "id": 0, "result": { "result": { - "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", "ipauniqueid": [ "09e4ab26-f456-11df-bb95-00163e72f2d9" ], diff --git a/install/static/test/data/sudocmd_find.json b/install/static/test/data/sudocmd_find.json index 639877156..f7f5a23ef 100644 --- a/install/static/test/data/sudocmd_find.json +++ b/install/static/test/data/sudocmd_find.json @@ -5,13 +5,13 @@ "count": 2, "result": [ { - "dn": "sudocmd=/usr/bin/more,cn=sudocmds,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/more,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", "sudocmd": [ "/usr/bin/more" ] }, { - "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", "sudocmd": [ "/usr/bin/less" ] diff --git a/install/static/test/data/sudocmd_memberof_add.json b/install/static/test/data/sudocmd_memberof_add.json index e263007d8..fc45ef4e2 100644 --- a/install/static/test/data/sudocmd_memberof_add.json +++ b/install/static/test/data/sudocmd_memberof_add.json @@ -20,7 +20,7 @@ "description": [ "Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=accounts,dc=ipa", + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=ipa", "member_sudocmd": [ "/usr/bin/less" ] @@ -42,7 +42,7 @@ "description": [ "Group 2" ], - "dn": "cn=group2,cn=sudocmdgroups,cn=accounts,dc=ipa", + "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=ipa", "member_sudocmd": [ "/usr/bin/more" ] diff --git a/install/static/test/data/sudocmd_memberof_remove.json b/install/static/test/data/sudocmd_memberof_remove.json index 347b5cded..c5e031b86 100644 --- a/install/static/test/data/sudocmd_memberof_remove.json +++ b/install/static/test/data/sudocmd_memberof_remove.json @@ -20,7 +20,7 @@ "description": [ "Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=accounts,dc=ipa" + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=ipa" } }, { @@ -39,7 +39,7 @@ "description": [ "Group 2" ], - "dn": "cn=group2,cn=sudocmdgroups,cn=accounts,dc=ipa", + "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=ipa", "memberindirect_sudocmd": [ "/usr/bin/more" ] diff --git a/install/static/test/data/sudocmd_memberof_show.json b/install/static/test/data/sudocmd_memberof_show.json index 9b7f3af23..279dc6c96 100644 --- a/install/static/test/data/sudocmd_memberof_show.json +++ b/install/static/test/data/sudocmd_memberof_show.json @@ -13,7 +13,7 @@ "description": [ "Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=accounts,dc=ipa", + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=ipa", "ipauniqueid": [ "fc775d2e-1d56-11e0-b7cd-00163e2fe6de" ], @@ -39,7 +39,7 @@ "description": [ "Group 2" ], - "dn": "cn=group2,cn=sudocmdgroups,cn=accounts,dc=ipa", + "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=ipa", "ipauniqueid": [ "b90c1930-1d5b-11e0-ac89-00163e2fe6de" ], diff --git a/install/static/test/data/sudocmd_show.json b/install/static/test/data/sudocmd_show.json index a08401d7b..b27c832f3 100644 --- a/install/static/test/data/sudocmd_show.json +++ b/install/static/test/data/sudocmd_show.json @@ -11,13 +11,13 @@ "nsaccountlock": "rscwo", "sudocmd": "rscwo" }, - "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", "ipauniqueid": [ "06708d0e-f454-11df-9273-00163e72f2d9" ], "memberof": [ - "cn=group1,cn=sudocmdgroups,cn=accounts,dc=dev,dc=example,dc=com", - "cn=group2,cn=sudocmdgroups,cn=accounts,dc=dev,dc=example,dc=com" + "cn=group1,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com", + "cn=group2,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com" ], "objectclass": [ "ipaobject", diff --git a/install/static/test/data/sudocmdgroup_add.json b/install/static/test/data/sudocmdgroup_add.json index 951a3a917..ce389f564 100644 --- a/install/static/test/data/sudocmdgroup_add.json +++ b/install/static/test/data/sudocmdgroup_add.json @@ -9,7 +9,7 @@ "description": [ "Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com", "ipauniqueid": [ "1a8f4852-f459-11df-815c-00163e72f2d9" ], diff --git a/install/static/test/data/sudocmdgroup_add_member.json b/install/static/test/data/sudocmdgroup_add_member.json index 0646f7251..254746e65 100644 --- a/install/static/test/data/sudocmdgroup_add_member.json +++ b/install/static/test/data/sudocmdgroup_add_member.json @@ -16,7 +16,7 @@ "description": [ "SUDO Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com", "member_sudocmd": [ "/usr/bin/more", "/usr/bin/less" diff --git a/install/static/test/data/sudocmdgroup_find.json b/install/static/test/data/sudocmdgroup_find.json index fb2effd23..d640e35bd 100644 --- a/install/static/test/data/sudocmdgroup_find.json +++ b/install/static/test/data/sudocmdgroup_find.json @@ -11,7 +11,7 @@ "description": [ "Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com", "member_sudocmd": [ "/usr/bin/more", "/usr/bin/less" @@ -24,7 +24,7 @@ "description": [ "Group 2" ], - "dn": "cn=group2,cn=sudocmdgroups,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=group2,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com" } ], "summary": "2 sudo command groups matched", diff --git a/install/static/test/data/sudocmdgroup_member_sudocmd.json b/install/static/test/data/sudocmdgroup_member_sudocmd.json index 5f017f9c0..7871a4684 100644 --- a/install/static/test/data/sudocmdgroup_member_sudocmd.json +++ b/install/static/test/data/sudocmdgroup_member_sudocmd.json @@ -10,12 +10,12 @@ "description": [ "more" ], - "dn": "sudocmd=/usr/bin/more,cn=sudocmds,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/more,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", "ipauniqueid": [ "a9138c9a-fc0c-11df-8584-00163e72f2d9" ], "memberof": [ - "cn=test,cn=sudocmdgroups,cn=accounts,dc=dev,dc=example,dc=com" + "cn=test,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com" ], "objectclass": [ "ipaobject", @@ -34,12 +34,12 @@ "description": [ "less" ], - "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "sudocmd=/usr/bin/less,cn=sudocmds,cn=sudo,dc=dev,dc=example,dc=com", "ipauniqueid": [ "44ce29ee-fc38-11df-b995-00163e72f2d9" ], "memberof": [ - "cn=test,cn=sudocmdgroups,cn=accounts,dc=dev,dc=example,dc=com" + "cn=test,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com" ], "objectclass": [ "ipaobject", diff --git a/install/static/test/data/sudocmdgroup_remove_member.json b/install/static/test/data/sudocmdgroup_remove_member.json index 55144b9c6..22353c314 100644 --- a/install/static/test/data/sudocmdgroup_remove_member.json +++ b/install/static/test/data/sudocmdgroup_remove_member.json @@ -16,7 +16,7 @@ "description": [ "SUDO Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=accounts,dc=dev,dc=example,dc=com" + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com" } } } diff --git a/install/static/test/data/sudocmdgroup_show.json b/install/static/test/data/sudocmdgroup_show.json index f93ddaa67..1478ba265 100644 --- a/install/static/test/data/sudocmdgroup_show.json +++ b/install/static/test/data/sudocmdgroup_show.json @@ -23,7 +23,7 @@ "description": [ "Group 1" ], - "dn": "cn=group1,cn=sudocmdgroups,cn=accounts,dc=dev,dc=example,dc=com", + "dn": "cn=group1,cn=sudocmdgroups,cn=sudo,dc=dev,dc=example,dc=com", "ipauniqueid": [ "d99989a6-f459-11df-9273-00163e72f2d9" ], @@ -41,4 +41,4 @@ "summary": null, "value": "group1" } -}
\ No newline at end of file +} diff --git a/install/static/test/data/sudorule_add.json b/install/static/test/data/sudorule_add.json index 2b2b63947..396b4935c 100644 --- a/install/static/test/data/sudorule_add.json +++ b/install/static/test/data/sudorule_add.json @@ -9,7 +9,7 @@ "description": [ "test" ], - "dn": "ipauniqueid=94ef3550-f443-11df-a2aa-00163e72f2d9,cn=sudorules,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=94ef3550-f443-11df-a2aa-00163e72f2d9,cn=sudorules,cn=sudo,dc=dev,dc=example,dc=com", "ipauniqueid": [ "94ef3550-f443-11df-a2aa-00163e72f2d9" ], diff --git a/install/static/test/data/sudorule_find.json b/install/static/test/data/sudorule_find.json index ff8474af7..a843b2a5b 100644 --- a/install/static/test/data/sudorule_find.json +++ b/install/static/test/data/sudorule_find.json @@ -8,7 +8,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=4fc57a02-f23311df-b268e50e-a3b3ef71,cn=sudorules,dc=dev,dc=example,dc=com" + "dn": "ipauniqueid=4fc57a02-f23311df-b268e50e-a3b3ef71,cn=sudorules,cn=sudo,dc=dev,dc=example,dc=com" } ], "summary": null, diff --git a/install/static/test/data/sudorule_show.json b/install/static/test/data/sudorule_show.json index 5d8473259..51f83af70 100644 --- a/install/static/test/data/sudorule_show.json +++ b/install/static/test/data/sudorule_show.json @@ -31,7 +31,7 @@ "cn": [ "test" ], - "dn": "ipauniqueid=4fc57a02-f23311df-b268e50e-a3b3ef71,cn=sudorules,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=4fc57a02-f23311df-b268e50e-a3b3ef71,cn=sudorules,cn=sudo,dc=dev,dc=example,dc=com", "externalhost": [ "external.example.com" ], |