IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove all references to use_ldap2.

Browse Source
This commit is contained in:
Pavel Zuna 2009-06-16 13:35:40 +02:00 committed by Rob Crittenden
parent 3ce00484f4
commit ebdebe802d
14 changed files with 0 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ipalib/plugins/aci2.py
View File

@ -165,7 +165,6 @@ class aci2_create(crud.Create):
:param kw: Keyword arguments for the other LDAP attributes.
"""
assert 'aciname' not in kw
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
newaci = _make_aci(None, aciname, kw)
@ -204,7 +203,6 @@ class aci2_delete(crud.Delete):
:param kw: unused
"""
assert 'aciname' not in kw
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
(dn, entry_attrs) = ldap.get_entry(self.api.env.basedn, ['aci'])
@ -238,7 +236,6 @@ class aci2_mod(crud.Update):
Modify ACI.
"""
def execute(self, aciname, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
(dn, entry_attrs) = ldap.get_entry(self.api.env.basedn, ['aci'])
@ -272,7 +269,6 @@ class aci2_find(crud.Search):
Search for ACIs.
"""
def execute(self, term, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
(dn, entry_attrs) = ldap.get_entry(self.api.env.basedn, ['aci'])
@ -374,7 +370,6 @@ class aci2_show(crud.Retrieve):
:param uid: The login name of the user to retrieve.
:param kw: unused
"""
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
(dn, entry_attrs) = ldap.get_entry(self.api.env.basedn, ['aci'])

7
ipalib/plugins/basegroup2.py
View File

@ -151,7 +151,6 @@ class basegroup2_create(crud.Create):
"""
assert 'cn' not in kw
assert 'dn' not in kw
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
entry_attrs = self.args_options_2_entry(cn, **kw)
dn = self.obj.get_dn(ldap, cn)
@ -195,7 +194,6 @@ class basegroup2_delete(crud.Delete):
:param kw: Unused
"""
assert self.container
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
(dn, entry_attrs) = ldap.find_entry_by_attr(
@ -237,7 +235,6 @@ class basegroup2_mod(crud.Update):
assert 'dn' not in kw
assert self.container
assert self.filter_class
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
(dn, entry_attrs) = ldap.find_entry_by_attr(
@ -280,7 +277,6 @@ class basegroup2_find(crud.Search):
)
def execute(self, term, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
search_kw = self.args_options_2_entry(**kw)
@ -364,7 +360,6 @@ class basegroup2_show(crud.Retrieve):
:param kw: Not used.
"""
assert self.container
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
(dn, entry_attrs) = ldap.find_entry_by_attr(
@ -424,7 +419,6 @@ class basegroup2_add_member(Command):
:param kw: users is a comma-separated list of users to add
"""
assert self.container
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
to_add = []
add_failed = []
@ -504,7 +498,6 @@ class basegroup2_del_member(Command):
:param kw: users is a comma-separated list of users to remove
"""
assert self.container
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
to_remove = []
remove_failed = []

2
ipalib/plugins/config2.py
View File

@ -115,7 +115,6 @@ class config2_mod(Command):
:param kw: Keyword arguments for the other LDAP attributes.
"""
assert 'dn' not in options
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
(dn, entry_attrs) = ldap.get_ipa_config()
@ -163,7 +162,6 @@ class config2_show(Command):
:param args: Not used.
:param kw: Not used.
"""
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
return ldap.get_ipa_config()

10
ipalib/plugins/dns2.py
View File

@ -171,7 +171,6 @@ class dns2_create(crud.Create):
"""
def execute(self, *args, **options):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.Backend.ldap2
idnsname = args[0]
@ -217,7 +216,6 @@ class dns2_delete(crud.Delete):
"""
def execute(self, *args, **options):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
idnsname = args[0]
@ -255,7 +253,6 @@ class dns2_mod(crud.Update):
"""
def execute(self, *args, **options):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
idnsname = args[0]
@ -297,7 +294,6 @@ class dns2_find(crud.Search):
)
def execute(self, term, **options):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
# build search filter
@ -351,7 +347,6 @@ class dns2_show(crud.Retrieve):
)
def execute(self, idnsname, **options):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
# build entry DN
@ -389,7 +384,6 @@ class dns2_enable(Command):
)
def execute(self, zone):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
# build entry DN
@ -425,7 +419,6 @@ class dns2_disable(Command):
)
def execute(self, zone):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
# build entry DN
@ -490,7 +483,6 @@ class dns2_add_rr(Command):
)
def execute(self, zone, idnsname, type, data, **options):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
attr = '%srecord' % type
@ -585,7 +577,6 @@ class dns2_del_rr(Command):
)
def execute(self, zone, idnsname, type, data):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
attr = '%srecord' % type
@ -677,7 +668,6 @@ class dns2_find_rr(Command):
)
def execute(self, zone, term, **options):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
if 'type' in options:
attr = '%srecord' % options['type']

7
ipalib/plugins/group2.py
View File

@ -74,7 +74,6 @@ class group2_create(basegroup2_create):
"""
assert 'cn' not in kw
assert 'dn' not in kw
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
config = ldap.get_ipa_config()[1]
@ -105,7 +104,6 @@ class group2_delete(basegroup2_delete):
:param cn: The name of the group being removed
:param kw: Unused
"""
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
dn = get_dn_by_attr(ldap, 'cn', cn, self.filter_class, self.container)
@ -153,7 +151,6 @@ class group2_mod(basegroup2_mod):
"""
assert 'cn' not in kw
assert 'dn' not in kw
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
if kw['posix'] or 'gidnumber' in kw:
@ -180,7 +177,6 @@ class group2_find(basegroup2_find):
filter_class = _default_class
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(group2_find, self).execute(cn, **kw)
api.register(group2_find)
@ -194,7 +190,6 @@ class group2_show(basegroup2_show):
container = _container_dn
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(group2_show, self).execute(cn, **kw)
api.register(group2_show)
@ -207,7 +202,6 @@ class group2_add_member(basegroup2_add_member):
container = _container_dn
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(group2_add_member, self).execute(cn, **kw)
api.register(group2_add_member)
@ -220,7 +214,6 @@ class group2_del_member(basegroup2_del_member):
container = _container_dn
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(group2_del_member, self).execute(cn, **kw)
api.register(group2_del_member)

5
ipalib/plugins/host2.py
View File

@ -145,7 +145,6 @@ class host2_create(crud.Create):
assert 'cn' not in kw
assert 'dn' not in kw
assert 'krbprincipalname' not in kw
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
entry_attrs = self.args_options_2_entry(hostname, **kw)
@ -209,7 +208,6 @@ class host2_delete(crud.Delete):
:param hostname: The name of the host being removed.
:param kw: Not used.
"""
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
dn = get_host(ldap, hostname)
@ -251,7 +249,6 @@ class host2_mod(crud.Update):
"""
assert 'fqdn' not in kw
assert 'dn' not in kw
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
dn = get_host(ldap, hostname)
@ -290,7 +287,6 @@ class host2_find(crud.Search):
)
def execute(self, term, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
search_kw = self.args_options_2_entry(**kw)
@ -358,7 +354,6 @@ class host2_show(crud.Retrieve):
:param hostname: The login name of the host to retrieve.
:param kw: "all" set to True = return all attributes
"""
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
dn = get_host(ldap, hostname)

7
ipalib/plugins/hostgroup2.py
View File

@ -45,7 +45,6 @@ class hostgroup2_create(basegroup2_create):
base_classes = basegroup2_create.base_classes + (_default_class, )
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(hostgroup2_create, self).execute(cn, **kw)
api.register(hostgroup2_create)
@ -58,7 +57,6 @@ class hostgroup2_delete(basegroup2_delete):
container = _container_dn
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(hostgroup2_delete, self).execute(cn, **kw)
api.register(hostgroup2_delete)
@ -71,7 +69,6 @@ class hostgroup2_mod(basegroup2_mod):
container = _container_dn
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(hostgroup2_mod, self).execute(cn, **kw)
api.register(hostgroup2_mod)
@ -84,7 +81,6 @@ class hostgroup2_find(basegroup2_find):
container = _container_dn
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(hostgroup2_find, self).execute(cn, **kw)
api.register(hostgroup2_find)
@ -97,7 +93,6 @@ class hostgroup2_show(basegroup2_show):
container = _container_dn
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(hostgroup2_show, self).execute(cn, **kw)
api.register(hostgroup2_show)
@ -136,7 +131,6 @@ class hostgroup2_add_member(basegroup2_add_member):
:parem kw: users is a comma-separated list of users to add
"""
assert self.container
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
dn = get_dn_by_attr(ldap, 'cn', cn, self.filter_class, self.container)
to_add = []
@ -207,7 +201,6 @@ class hostgroup2_del_member(basegroup2_del_member):
:parem kw: users is a comma-separated list of users to remove
"""
assert self.container
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
dn = get_dn_by_attr(ldap, 'cn', cn, self.filter_class, self.container)
to_remove = []

7
ipalib/plugins/netgroup2.py
View File

@ -66,7 +66,6 @@ class netgroup2_create(basegroup2_create):
"""
assert 'cn' not in kw
assert 'dn' not in kw
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
entry_attrs = self.args_options_2_entry(cn, **kw)
@ -91,7 +90,6 @@ class netgroup2_delete(basegroup2_delete):
filter_class = _default_class
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(netgroup2_delete, self).execute(cn, **kw)
api.register(netgroup2_delete)
@ -105,7 +103,6 @@ class netgroup2_mod(basegroup2_mod):
filter_class = _default_class
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(netgroup2_mod, self).execute(cn, **kw)
api.register(netgroup2_mod)
@ -119,7 +116,6 @@ class netgroup2_find(basegroup2_find):
filter_class = _default_class
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(netgroup2_find, self).execute(cn, **kw)
api.register(netgroup2_find)
@ -134,7 +130,6 @@ class netgroup2_show(basegroup2_show):
container = _container_dn
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(netgroup2_show, self).execute(cn, **kw)
api.register(netgroup2_show)
@ -196,7 +191,6 @@ class netgroup2_add_member(basegroup2_add_member):
:param kw: hostgroups is a comma-separated list of hostgroups to add
"""
assert self.container
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
dn = get_dn_by_attr(ldap, 'cn', cn, self.filter_class, self.container)
to_add = []
@ -315,7 +309,6 @@ class netgroup2_del_member(basegroup2_del_member):
:param kw: hostgroups is a comma-separated list of hostgroups to remove
"""
assert self.container
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
dn = get_dn_by_attr(ldap, 'cn', cn, self.filter_class, self.container)
to_rem = []

1
ipalib/plugins/passwd2.py
View File

@ -52,7 +52,6 @@ class passwd2(Command):
:param principal: The login name or principal of the user
:param password: the new password
"""
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
if principal.find('@') != -1:

2
ipalib/plugins/pwpolicy2.py
View File

@ -84,7 +84,6 @@ class pwpolicy2_mod(Command):
def execute(self, *args, **options):
assert 'dn' not in options
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
entry_attrs = self.args_options_2_entry(*args, **options)
@ -127,7 +126,6 @@ class pwpolicy2_show(Command):
Display password policy.
"""
def execute(self, *args, **options):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
dn = self.api.env.container_accounts

7
ipalib/plugins/rolegroup2.py
View File

@ -46,7 +46,6 @@ class rolegroup2_create(basegroup2_create):
base_classes = basegroup2_create.base_classes + (_default_class, )
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(rolegroup2_create, self).execute(cn, **kw)
api.register(rolegroup2_create)
@ -59,7 +58,6 @@ class rolegroup2_delete(basegroup2_delete):
container = _container_dn
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(rolegroup2_delete, self).execute(cn, **kw)
api.register(rolegroup2_delete)
@ -72,7 +70,6 @@ class rolegroup2_mod(basegroup2_mod):
container = _container_dn
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(rolegroup2_mod, self).execute(cn, **kw)
api.register(rolegroup2_mod)
@ -85,7 +82,6 @@ class rolegroup2_find(basegroup2_find):
container = _container_dn
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(rolegroup2_find, self).execute(cn, **kw)
api.register(rolegroup2_find)
@ -99,7 +95,6 @@ class rolegroup2_show(basegroup2_show):
container = _container_dn
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(rolegroup2_show, self).execute(cn, **kw)
api.register(rolegroup2_show)
@ -112,7 +107,6 @@ class rolegroup2_add_member(basegroup2_add_member):
container = _container_dn
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(rolegroup2_add_member, self).execute(cn, **kw)
api.register(rolegroup2_add_member)
@ -125,7 +119,6 @@ class rolegroup2_del_member(basegroup2_del_member):
container = _container_dn
def execute(self, cn, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
return super(rolegroup2_del_member, self).execute(cn, **kw)
api.register(rolegroup2_del_member)

5
ipalib/plugins/service2.py
View File

@ -124,7 +124,6 @@ class service2_create(crud.Create):
:param kw: Keyword arguments for the other LDAP attributes.
"""
assert 'krbprincipalname' not in kw
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
# FIXME: should be in a normalizer. Need to fix normalizers to work
# on non-unicode data
@ -187,7 +186,6 @@ class service2_delete(crud.Delete):
:param principal: The service to be added in the form: service/hostname
:param kw: not used
"""
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
(dn, entry_attrs) = ldap.find_entry_by_attr(
@ -216,7 +214,6 @@ class service2_mod(crud.Update):
Modify service.
"""
def execute(self, principal, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap
# FIXME, should be in a normalizer. Need to fix normalizers to work
# on non-unicode data.
@ -261,7 +258,6 @@ class service2_find(crud.Search):
)
def execute(self, term, **kw):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
# lisp style!
@ -342,7 +338,6 @@ class service2_show(crud.Retrieve):
:param principal: The service principal to retrieve
:param kw: Not used.
"""
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
dn = ldap.make_dn_from_attr(

2
ipalib/plugins/taskgroup2.py
View File

@ -106,7 +106,6 @@ class taskgroup2_add_member(basegroup2_add_member):
:param kw: rolegroups is a comma-separated list of rolegroups to add
"""
assert self.container
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
dn = get_dn_by_attr(ldap, 'cn', cn, self.filter_class, self.container)
to_add = []
@ -169,7 +168,6 @@ class taskgroup2_del_member(basegroup2_del_member):
:param kw: rolegroups is a comma-separated list of rolegroups to remove
"""
assert self.container
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
dn = get_dn_by_attr(ldap, 'cn', cn, self.filter_class, self.container)
to_remove = []

7
ipalib/plugins/user2.py
View File

@ -101,7 +101,6 @@ class user2_create(crud.Create):
"""
def execute(self, *args, **options):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
uid = args[0]
@ -179,7 +178,6 @@ class user2_delete(crud.Delete):
"""
def execute(self, uid):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
if uid == 'admin':
@ -212,7 +210,6 @@ class user2_mod(crud.Update):
"""
def execute(self, uid, **options):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
# build entry attributes, don't include uid!
@ -251,7 +248,6 @@ class user2_find(crud.Search):
)
def execute(self, term, **options):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
# get list of search fields from config
@ -314,7 +310,6 @@ class user2_show(crud.Retrieve):
)
def execute(self, uid, **options):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
# build entry DN
@ -352,7 +347,6 @@ class user2_lock(Command):
)
def execute(self, uid):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
# build entry DN
@ -388,7 +382,6 @@ class user2_unlock(Command):
)
def execute(self, uid):
assert self.api.env.use_ldap2, 'use_ldap2 is False'
ldap = self.api.Backend.ldap2
# build entry DN