Move HBAC services and service groups to cn=hbac

https://fedorahosted.org/freeipa/ticket/762
This commit is contained in:
Jan Zeleny 2011-01-18 10:56:17 +01:00 committed by Simo Sorce
parent 066cf79365
commit 01f907c01b
14 changed files with 53 additions and 53 deletions

View File

@ -70,13 +70,19 @@ objectClass: automount
automountKey: /- automountKey: /-
automountInformation: auto.direct 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 changetype: add
objectClass: top objectClass: top
objectClass: nsContainer objectClass: nsContainer
cn: hbacservices cn: hbacservices
dn: cn=hbacservicegroups,cn=accounts,$SUFFIX dn: cn=hbacservicegroups,cn=hbac,$SUFFIX
changetype: add changetype: add
objectClass: top objectClass: top
objectClass: nsContainer objectClass: nsContainer
@ -106,12 +112,6 @@ objectClass: top
objectClass: nsContainer objectClass: nsContainer
cn: sudorules cn: sudorules
dn: cn=hbac,$SUFFIX
changetype: add
objectClass: top
objectClass: nsContainer
cn: hbac
dn: cn=etc,$SUFFIX dn: cn=etc,$SUFFIX
changetype: add changetype: add
objectClass: nsContainer objectClass: nsContainer
@ -208,7 +208,7 @@ gidNumber: eval($IDSTART+2)
description: Limited admins who can edit other users description: Limited admins who can edit other users
cn: editors cn: editors
dn: cn=sshd,cn=hbacservices,cn=accounts,$SUFFIX dn: cn=sshd,cn=hbacservices,cn=hbac,$SUFFIX
changetype: add changetype: add
objectclass: ipahbacservice objectclass: ipahbacservice
objectclass: ipaobject objectclass: ipaobject
@ -216,7 +216,7 @@ cn: sshd
description: sshd description: sshd
ipauniqueid:autogenerate ipauniqueid:autogenerate
dn: cn=ftp,cn=hbacservices,cn=accounts,$SUFFIX dn: cn=ftp,cn=hbacservices,cn=hbac,$SUFFIX
changetype: add changetype: add
objectclass: ipahbacservice objectclass: ipahbacservice
objectclass: ipaobject objectclass: ipaobject
@ -224,7 +224,7 @@ cn: ftp
description: ftp description: ftp
ipauniqueid:autogenerate ipauniqueid:autogenerate
dn: cn=su,cn=hbacservices,cn=accounts,$SUFFIX dn: cn=su,cn=hbacservices,cn=hbac,$SUFFIX
changetype: add changetype: add
objectclass: ipahbacservice objectclass: ipahbacservice
objectclass: ipaobject objectclass: ipaobject
@ -232,7 +232,7 @@ cn: su
description: su description: su
ipauniqueid:autogenerate ipauniqueid:autogenerate
dn: cn=login,cn=hbacservices,cn=accounts,$SUFFIX dn: cn=login,cn=hbacservices,cn=hbac,$SUFFIX
changetype: add changetype: add
objectclass: ipahbacservice objectclass: ipahbacservice
objectclass: ipaobject objectclass: ipaobject
@ -240,7 +240,7 @@ cn: login
description: login description: login
ipauniqueid:autogenerate ipauniqueid:autogenerate
dn: cn=su-l,cn=hbacservices,cn=accounts,$SUFFIX dn: cn=su-l,cn=hbacservices,cn=hbac,$SUFFIX
changetype: add changetype: add
objectclass: ipahbacservice objectclass: ipahbacservice
objectclass: ipaobject objectclass: ipaobject
@ -248,7 +248,7 @@ cn: su-l
description: su with login shell description: su with login shell
ipauniqueid:autogenerate ipauniqueid:autogenerate
dn: cn=sudo,cn=hbacservices,cn=accounts,$SUFFIX dn: cn=sudo,cn=hbacservices,cn=hbac,$SUFFIX
changetype: add changetype: add
objectclass: ipahbacservice objectclass: ipahbacservice
objectclass: ipaobject objectclass: ipaobject
@ -256,7 +256,7 @@ cn: sudo
description: sudo description: sudo
ipauniqueid:autogenerate ipauniqueid:autogenerate
dn: cn=sudo-i,cn=hbacservices,cn=accounts,$SUFFIX dn: cn=sudo-i,cn=hbacservices,cn=hbac,$SUFFIX
changetype: add changetype: add
objectclass: ipahbacservice objectclass: ipahbacservice
objectclass: ipaobject objectclass: ipaobject
@ -264,7 +264,7 @@ cn: sudo-i
description: sudo-i description: sudo-i
ipauniqueid:autogenerate ipauniqueid:autogenerate
dn: cn=gdm,cn=hbacservices,cn=accounts,$SUFFIX dn: cn=gdm,cn=hbacservices,cn=hbac,$SUFFIX
changetype: add changetype: add
objectclass: ipahbacservice objectclass: ipahbacservice
objectclass: ipaobject objectclass: ipaobject
@ -272,7 +272,7 @@ cn: gdm
description: gdm description: gdm
ipauniqueid:autogenerate ipauniqueid:autogenerate
dn: cn=gdm-password,cn=hbacservices,cn=accounts,$SUFFIX dn: cn=gdm-password,cn=hbacservices,cn=hbac,$SUFFIX
changetype: add changetype: add
objectclass: ipahbacservice objectclass: ipahbacservice
objectclass: ipaobject objectclass: ipaobject
@ -280,7 +280,7 @@ cn: gdm-password
description: gdm-password description: gdm-password
ipauniqueid:autogenerate ipauniqueid:autogenerate
dn: cn=kdm,cn=hbacservices,cn=accounts,$SUFFIX dn: cn=kdm,cn=hbacservices,cn=hbac,$SUFFIX
changetype: add changetype: add
objectclass: ipahbacservice objectclass: ipahbacservice
objectclass: ipaobject objectclass: ipaobject
@ -288,7 +288,7 @@ cn: kdm
description: kdm description: kdm
ipauniqueid:autogenerate ipauniqueid:autogenerate
dn: cn=SUDO,cn=hbacservicegroups,cn=accounts,$SUFFIX dn: cn=SUDO,cn=hbacservicegroups,cn=hbac,$SUFFIX
changetype: add changetype: add
objectClass: ipaobject objectClass: ipaobject
objectClass: ipahbacservicegroup objectClass: ipahbacservicegroup
@ -298,8 +298,8 @@ objectClass: top
cn: SUDO cn: SUDO
ipauniqueid:autogenerate ipauniqueid:autogenerate
description: Default group of SUDO related services description: Default group of SUDO related services
member: cn=sudo,cn=hbacservices,cn=accounts,$SUFFIX member: cn=sudo,cn=hbacservices,cn=hbac,$SUFFIX
member: cn=sudo-i,cn=hbacservices,cn=accounts,$SUFFIX member: cn=sudo-i,cn=hbacservices,cn=hbac,$SUFFIX
dn: cn=ipaConfig,cn=etc,$SUFFIX dn: cn=ipaConfig,cn=etc,$SUFFIX
changetype: add changetype: add

View File

@ -9,7 +9,7 @@
"description": [ "description": [
"Test Service" "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": [ "ipauniqueid": [
"c3302e82-ecfd11df-b3f78f4b-11cc007b" "c3302e82-ecfd11df-b3f78f4b-11cc007b"
], ],

View File

@ -11,7 +11,7 @@
"description": [ "description": [
"sshd" "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": [ "cn": [
@ -20,7 +20,7 @@
"description": [ "description": [
"ftp" "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": [ "cn": [
@ -29,7 +29,7 @@
"description": [ "description": [
"su" "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": [ "cn": [
@ -38,7 +38,7 @@
"description": [ "description": [
"login" "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": [ "cn": [
@ -47,7 +47,7 @@
"description": [ "description": [
"su with login shell" "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": [ "cn": [
@ -56,7 +56,7 @@
"description": [ "description": [
"sudo" "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": [ "cn": [
@ -65,7 +65,7 @@
"description": [ "description": [
"sudo-i" "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": [ "cn": [
@ -74,7 +74,7 @@
"description": [ "description": [
"gdm" "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": [ "cn": [
@ -83,7 +83,7 @@
"description": [ "description": [
"gdm-password" "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": [ "cn": [
@ -92,7 +92,7 @@
"description": [ "description": [
"kdm" "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, "summary": null,

View File

@ -17,12 +17,12 @@
"description": [ "description": [
"sudo" "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": [ "ipauniqueid": [
"676e92a1-ec7611df-b3f78f4b-11cc007b" "676e92a1-ec7611df-b3f78f4b-11cc007b"
], ],
"memberof": [ "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": [ "objectclass": [
"ipahbacservice", "ipahbacservice",

View File

@ -9,7 +9,7 @@
"description": [ "description": [
"Test Service Group" "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": [ "ipauniqueid": [
"0ab6ba82-ecfe11df-b3f78f4b-11cc007b" "0ab6ba82-ecfe11df-b3f78f4b-11cc007b"
], ],

View File

@ -15,7 +15,7 @@
"description": [ "description": [
"Test Service Group" "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": [ "member_hbacsvc": [
"test" "test"
] ]

View File

@ -11,7 +11,7 @@
"description": [ "description": [
"Default group of SUDO related services" "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": [ "member_hbacsvc": [
"sudo", "sudo",
"sudo-i" "sudo-i"

View File

@ -13,12 +13,12 @@
"description": [ "description": [
"sudo" "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": [ "ipauniqueid": [
"42927a86-f46d-11df-8cc1-00163e72f2d9" "42927a86-f46d-11df-8cc1-00163e72f2d9"
], ],
"memberof": [ "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": [ "objectclass": [
"ipahbacservice", "ipahbacservice",
@ -37,12 +37,12 @@
"description": [ "description": [
"sudo-i" "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": [ "ipauniqueid": [
"42970a6a-f46d-11df-8cc1-00163e72f2d9" "42970a6a-f46d-11df-8cc1-00163e72f2d9"
], ],
"memberof": [ "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": [ "objectclass": [
"ipahbacservice", "ipahbacservice",

View File

@ -15,7 +15,7 @@
"description": [ "description": [
"Test Service Group" "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"
} }
} }
} }

View File

@ -24,7 +24,7 @@
"description": [ "description": [
"Default group of SUDO related services" "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": [ "ipauniqueid": [
"676e92ab-ec7611df-b3f78f4b-11cc007b" "676e92ab-ec7611df-b3f78f4b-11cc007b"
], ],

View File

@ -3604,7 +3604,7 @@
], ],
"attribute_members": {}, "attribute_members": {},
"bindable": false, "bindable": false,
"container_dn": "cn=hbacservices,cn=accounts", "container_dn": "cn=hbacservices,cn=hbac",
"default_attributes": [ "default_attributes": [
"cn", "cn",
"description", "description",
@ -3725,7 +3725,7 @@
] ]
}, },
"bindable": false, "bindable": false,
"container_dn": "cn=hbacservicegroups,cn=accounts", "container_dn": "cn=hbacservicegroups,cn=hbac",
"default_attributes": [ "default_attributes": [
"cn", "cn",
"description", "description",
@ -7827,8 +7827,8 @@
"container_dns": "cn=dns", "container_dns": "cn=dns",
"container_group": "cn=groups,cn=accounts", "container_group": "cn=groups,cn=accounts",
"container_hbac": "cn=hbac", "container_hbac": "cn=hbac",
"container_hbacservice": "cn=hbacservices,cn=accounts", "container_hbacservice": "cn=hbacservices,cn=hbac",
"container_hbacservicegroup": "cn=hbacservicegroups,cn=accounts", "container_hbacservicegroup": "cn=hbacservicegroups,cn=hbac",
"container_host": "cn=computers,cn=accounts", "container_host": "cn=computers,cn=accounts",
"container_hostgroup": "cn=hostgroups,cn=accounts", "container_hostgroup": "cn=hostgroups,cn=accounts",
"container_netgroup": "cn=ng,cn=alt", "container_netgroup": "cn=ng,cn=alt",

View File

@ -1624,7 +1624,7 @@
}, },
"hbacsvc": { "hbacsvc": {
"attribute_members": {}, "attribute_members": {},
"container_dn": "cn=hbacservices,cn=accounts", "container_dn": "cn=hbacservices,cn=hbac",
"default_attributes": [ "default_attributes": [
"cn", "cn",
"description", "description",
@ -1713,7 +1713,7 @@
"hbacsvc" "hbacsvc"
] ]
}, },
"container_dn": "cn=hbacservicegroups,cn=accounts", "container_dn": "cn=hbacservicegroups,cn=hbac",
"default_attributes": [ "default_attributes": [
"cn", "cn",
"description", "description",

View File

@ -96,8 +96,8 @@ DEFAULT_CONFIG = (
('container_policylinks', 'cn=policylinks,cn=configs,cn=policies'), ('container_policylinks', 'cn=policylinks,cn=configs,cn=policies'),
('container_netgroup', 'cn=ng,cn=alt'), ('container_netgroup', 'cn=ng,cn=alt'),
('container_hbac', 'cn=hbac'), ('container_hbac', 'cn=hbac'),
('container_hbacservice', 'cn=hbacservices,cn=accounts'), ('container_hbacservice', 'cn=hbacservices,cn=hbac'),
('container_hbacservicegroup', 'cn=hbacservicegroups,cn=accounts'), ('container_hbacservicegroup', 'cn=hbacservicegroups,cn=hbac'),
('container_dns', 'cn=dns'), ('container_dns', 'cn=dns'),
('container_virtual', 'cn=virtual operations,cn=etc'), ('container_virtual', 'cn=virtual operations,cn=etc'),
('container_sudorule', 'cn=sudorules,cn=sudo'), ('container_sudorule', 'cn=sudorules,cn=sudo'),

View File

@ -26,10 +26,10 @@ from tests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid
from tests.test_xmlrpc import objectclasses from tests.test_xmlrpc import objectclasses
hbacsvcgroup1 = u'testhbacsvcgroup1' 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' 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): class test_hbacsvcgroup(Declarative):