View | Details | Raw Unified | Return to bug 27804
Collapse All | Expand All

(-)a/management/univention-ldap/scripts/convert_to_sharesSambaWriteable.py (-1 lines)
 Lines 42-48    Link Here 
42
from univention.config_registry import ConfigRegistry
42
from univention.config_registry import ConfigRegistry
43
43
44
44
45
co = univention.admin.config.config()
46
baseConfig = ConfigRegistry()
45
baseConfig = ConfigRegistry()
47
baseConfig.load()
46
baseConfig.load()
48
47
(-)a/packaging/univention-directory-manager-module-example/scripts/ip-phone-tool (-2 / +1 lines)
 Lines 36-42   univention.debug.init('/var/log/univention/ip-phone-tool.log', univention.debug. Link Here 
36
36
37
import univention.config_registry
37
import univention.config_registry
38
import univention.admin.uldap
38
import univention.admin.uldap
39
import univention.admin.config
40
import univention.admin.modules
39
import univention.admin.modules
41
import univention.admin.objects
40
import univention.admin.objects
42
import univention.admin.filter
41
import univention.admin.filter
 Lines 86-92   class ipphonetool(object): Link Here 
86
			sys.exit(1)
85
			sys.exit(1)
87
86
88
		self.position = univention.admin.uldap.position(self.ldap_base)
87
		self.position = univention.admin.uldap.position(self.ldap_base)
89
		self.co = univention.admin.config.config()
88
		self.co = None
90
		# Get univention.admin.handlers.test.ip_phone + custom/extended attributes + UCR modificaations
89
		# Get univention.admin.handlers.test.ip_phone + custom/extended attributes + UCR modificaations
91
		self.module = univention.admin.modules.get('test/ip_phone')
90
		self.module = univention.admin.modules.get('test/ip_phone')
92
		univention.admin.modules.init(self.lo, self.position, self.module)
91
		univention.admin.modules.init(self.lo, self.position, self.module)
(-)a/services/univention-samba/vampire/change_sid (-1 lines)
 Lines 38-44   import univention.debug Link Here 
38
univention.debug.init('/dev/null', 1, 1)
38
univention.debug.init('/dev/null', 1, 1)
39
39
40
import univention.admin.uldap
40
import univention.admin.uldap
41
import univention.admin.config
42
import univention.admin.modules
41
import univention.admin.modules
43
import univention.admin.handlers.users.user
42
import univention.admin.handlers.users.user
44
import univention.admin.handlers.groups.group
43
import univention.admin.handlers.groups.group
(-)a/services/univention-samba/vampire/fix_primary_group (-1 lines)
 Lines 35-41   import univention.debug Link Here 
35
univention.debug.init('/dev/null', 1, 1)
35
univention.debug.init('/dev/null', 1, 1)
36
36
37
import univention.admin.uldap
37
import univention.admin.uldap
38
import univention.admin.config
39
import univention.admin.modules
38
import univention.admin.modules
40
import univention.admin.allocators
39
import univention.admin.allocators
41
40
(-)a/services/univention-samba/vampire/fix_primary_groups (-1 lines)
 Lines 35-41   import univention.debug Link Here 
35
univention.debug.init('/dev/null', 1, 1)
35
univention.debug.init('/dev/null', 1, 1)
36
36
37
import univention.admin.uldap
37
import univention.admin.uldap
38
import univention.admin.config
39
import univention.admin.modules
38
import univention.admin.modules
40
import univention.admin.handlers.users.user
39
import univention.admin.handlers.users.user
41
import univention.admin.handlers.groups.group
40
import univention.admin.handlers.groups.group
(-)a/services/univention-samba/vampire/fix_user_sids (-1 lines)
 Lines 36-42   import univention.debug Link Here 
36
univention.debug.init('/dev/null', 1, 1)
36
univention.debug.init('/dev/null', 1, 1)
37
37
38
import univention.admin.uldap
38
import univention.admin.uldap
39
import univention.admin.config
40
import univention.admin.modules
39
import univention.admin.modules
41
import univention.admin.allocators
40
import univention.admin.allocators
42
41
(-)a/services/univention-samba/vampire/set_domain_sid (-1 lines)
 Lines 36-42   import univention.debug Link Here 
36
univention.debug.init('/dev/null', 1, 1)
36
univention.debug.init('/dev/null', 1, 1)
37
37
38
import univention.admin.uldap
38
import univention.admin.uldap
39
import univention.admin.config
40
import univention.admin.modules
39
import univention.admin.modules
41
import univention.admin.allocators
40
import univention.admin.allocators
42
41
(-)a/services/univention-samba4/scripts/migrate-sid.py (-1 lines)
 Lines 36-42    Link Here 
36
import optparse
36
import optparse
37
import univention.admin
37
import univention.admin
38
import univention.admin.uldap
38
import univention.admin.uldap
39
import univention.admin.config
40
import univention.config_registry
39
import univention.config_registry
41
40
42
configRegistry = univention.config_registry.ConfigRegistry()
41
configRegistry = univention.config_registry.ConfigRegistry()
(-)a/test/ucs-test-tools/usr/sbin/create-32k-users-in-groups (-6 / +2 lines)
 Lines 37-43   import univention.debug Link Here 
37
import univention.admin
37
import univention.admin
38
import univention.admin.modules
38
import univention.admin.modules
39
import univention.admin.objects
39
import univention.admin.objects
40
import univention.admin.config
41
import univention.admin.uldap
40
import univention.admin.uldap
42
import ldap
41
import ldap
43
from ldap.dn import escape_dn_chars
42
from ldap.dn import escape_dn_chars
 Lines 49-57   class MassCreate(object): Link Here 
49
	"""Mass create users and groups."""
48
	"""Mass create users and groups."""
50
49
51
	def __init__(self, count):
50
	def __init__(self, count):
52
		# basic LDAP configuration
53
		self.config = univention.admin.config.config()
54
55
		# create LDAP connection
51
		# create LDAP connection
56
		self.access, self.position = univention.admin.uldap.getAdminConnection()
52
		self.access, self.position = univention.admin.uldap.getAdminConnection()
57
53
 Lines 76-82   class MassCreate(object): Link Here 
76
72
77
	def group(self, name, in_group=None):
73
	def group(self, name, in_group=None):
78
		"""Create group, which is itself member in_group."""
74
		"""Create group, which is itself member in_group."""
79
		g = self.gg.object(co=self.config, lo=self.access, position=self.gp)
75
		g = self.gg.object(co=None, lo=self.access, position=self.gp)
80
		g.options = ['posix', 'samba']
76
		g.options = ['posix', 'samba']
81
		g.open()
77
		g.open()
82
		g.info['name'] = name
78
		g.info['name'] = name
 Lines 97-103   class MassCreate(object): Link Here 
97
	def user(self, name, groups):
93
	def user(self, name, groups):
98
		"""Create user, which is itself member in groups."""
94
		"""Create user, which is itself member in groups."""
99
		gdn = ["cn=%s,%s" % (escape_dn_chars(group), self.gp.getDn()) for group in groups]
95
		gdn = ["cn=%s,%s" % (escape_dn_chars(group), self.gp.getDn()) for group in groups]
100
		u = self.uu.object(co=self.config, lo=self.access, position=self.up)
96
		u = self.uu.object(co=None, lo=self.access, position=self.up)
101
		# u.options = ['posix', 'samba']
97
		# u.options = ['posix', 'samba']
102
		u.open()
98
		u.open()
103
		u.info['username'] = name
99
		u.info['username'] = name

Return to bug 27804