diff --git a/management/univention-ldap/scripts/convert_to_sharesSambaWriteable.py b/management/univention-ldap/scripts/convert_to_sharesSambaWriteable.py index 6c9b485..09a719b 100755 --- a/management/univention-ldap/scripts/convert_to_sharesSambaWriteable.py +++ b/management/univention-ldap/scripts/convert_to_sharesSambaWriteable.py @@ -42,7 +42,6 @@ from univention.config_registry import ConfigRegistry -co = univention.admin.config.config() baseConfig = ConfigRegistry() baseConfig.load() diff --git a/packaging/univention-directory-manager-module-example/scripts/ip-phone-tool b/packaging/univention-directory-manager-module-example/scripts/ip-phone-tool index ba1e71e..cde5674 100755 --- a/packaging/univention-directory-manager-module-example/scripts/ip-phone-tool +++ b/packaging/univention-directory-manager-module-example/scripts/ip-phone-tool @@ -36,7 +36,6 @@ univention.debug.init('/var/log/univention/ip-phone-tool.log', univention.debug. import univention.config_registry import univention.admin.uldap -import univention.admin.config import univention.admin.modules import univention.admin.objects import univention.admin.filter @@ -86,7 +85,7 @@ class ipphonetool(object): sys.exit(1) self.position = univention.admin.uldap.position(self.ldap_base) - self.co = univention.admin.config.config() + self.co = None # Get univention.admin.handlers.test.ip_phone + custom/extended attributes + UCR modificaations self.module = univention.admin.modules.get('test/ip_phone') univention.admin.modules.init(self.lo, self.position, self.module) diff --git a/services/univention-samba/vampire/change_sid b/services/univention-samba/vampire/change_sid index c504ae8..37bf3ff 100755 --- a/services/univention-samba/vampire/change_sid +++ b/services/univention-samba/vampire/change_sid @@ -38,7 +38,6 @@ import univention.debug univention.debug.init('/dev/null', 1, 1) import univention.admin.uldap -import univention.admin.config import univention.admin.modules import univention.admin.handlers.users.user import univention.admin.handlers.groups.group diff --git a/services/univention-samba/vampire/fix_primary_group b/services/univention-samba/vampire/fix_primary_group index cf5abc0..3020190 100755 --- a/services/univention-samba/vampire/fix_primary_group +++ b/services/univention-samba/vampire/fix_primary_group @@ -35,7 +35,6 @@ import univention.debug univention.debug.init('/dev/null', 1, 1) import univention.admin.uldap -import univention.admin.config import univention.admin.modules import univention.admin.allocators diff --git a/services/univention-samba/vampire/fix_primary_groups b/services/univention-samba/vampire/fix_primary_groups index 0d55641..4aa6e2e 100755 --- a/services/univention-samba/vampire/fix_primary_groups +++ b/services/univention-samba/vampire/fix_primary_groups @@ -35,7 +35,6 @@ import univention.debug univention.debug.init('/dev/null', 1, 1) import univention.admin.uldap -import univention.admin.config import univention.admin.modules import univention.admin.handlers.users.user import univention.admin.handlers.groups.group diff --git a/services/univention-samba/vampire/fix_user_sids b/services/univention-samba/vampire/fix_user_sids index 9ea1767..6a40546 100755 --- a/services/univention-samba/vampire/fix_user_sids +++ b/services/univention-samba/vampire/fix_user_sids @@ -36,7 +36,6 @@ import univention.debug univention.debug.init('/dev/null', 1, 1) import univention.admin.uldap -import univention.admin.config import univention.admin.modules import univention.admin.allocators diff --git a/services/univention-samba/vampire/set_domain_sid b/services/univention-samba/vampire/set_domain_sid index b23c2b2..d09de7f 100755 --- a/services/univention-samba/vampire/set_domain_sid +++ b/services/univention-samba/vampire/set_domain_sid @@ -36,7 +36,6 @@ import univention.debug univention.debug.init('/dev/null', 1, 1) import univention.admin.uldap -import univention.admin.config import univention.admin.modules import univention.admin.allocators diff --git a/services/univention-samba4/scripts/migrate-sid.py b/services/univention-samba4/scripts/migrate-sid.py index 881e102..e01a0fd 100755 --- a/services/univention-samba4/scripts/migrate-sid.py +++ b/services/univention-samba4/scripts/migrate-sid.py @@ -36,7 +36,6 @@ import optparse import univention.admin import univention.admin.uldap -import univention.admin.config import univention.config_registry configRegistry = univention.config_registry.ConfigRegistry() diff --git a/test/ucs-test-tools/usr/sbin/create-32k-users-in-groups b/test/ucs-test-tools/usr/sbin/create-32k-users-in-groups index 8cf700c..88f3537 100755 --- a/test/ucs-test-tools/usr/sbin/create-32k-users-in-groups +++ b/test/ucs-test-tools/usr/sbin/create-32k-users-in-groups @@ -37,7 +37,6 @@ import univention.debug import univention.admin import univention.admin.modules import univention.admin.objects -import univention.admin.config import univention.admin.uldap import ldap from ldap.dn import escape_dn_chars @@ -49,9 +48,6 @@ class MassCreate(object): """Mass create users and groups.""" def __init__(self, count): - # basic LDAP configuration - self.config = univention.admin.config.config() - # create LDAP connection self.access, self.position = univention.admin.uldap.getAdminConnection() @@ -76,7 +72,7 @@ class MassCreate(object): def group(self, name, in_group=None): """Create group, which is itself member in_group.""" - g = self.gg.object(co=self.config, lo=self.access, position=self.gp) + g = self.gg.object(co=None, lo=self.access, position=self.gp) g.options = ['posix', 'samba'] g.open() g.info['name'] = name @@ -97,7 +93,7 @@ class MassCreate(object): def user(self, name, groups): """Create user, which is itself member in groups.""" gdn = ["cn=%s,%s" % (escape_dn_chars(group), self.gp.getDn()) for group in groups] - u = self.uu.object(co=self.config, lo=self.access, position=self.up) + u = self.uu.object(co=None, lo=self.access, position=self.up) # u.options = ['posix', 'samba'] u.open() u.info['username'] = name