Attachment #7314 for bug #40041

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

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_backup.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 484-490 def open(self):	Link Here

484

486

485

487

486

	def _ldap_pre_create(self):

488

	def _ldap_pre_create(self):

487

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

489

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

488

		if not self['password']:

490

		if not self['password']:

489

			self['password']=self.oldattr.get('password',[''])[0]

491

			self['password']=self.oldattr.get('password',[''])[0]

490

			self.modifypassword=0

492

			self.modifypassword=0

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_master.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 483-489 def open(self):	Link Here

483

485

484

486

485

	def _ldap_pre_create(self):

487

	def _ldap_pre_create(self):

486

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

488

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

487

		if not self['password']:

489

		if not self['password']:

488

			self['password']=self.oldattr.get('password',[''])[0]

490

			self['password']=self.oldattr.get('password',[''])[0]

489

			self.modifypassword=0

491

			self.modifypassword=0

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_slave.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 485-491 def open(self):	Link Here

485

487

486

488

487

	def _ldap_pre_create(self):

489

	def _ldap_pre_create(self):

488

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

490

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

489

		if not self['password']:

491

		if not self['password']:

490

			self['password']=self.oldattr.get('password',[''])[0]

492

			self['password']=self.oldattr.get('password',[''])[0]

491

			self.modifypassword=0

493

			self.modifypassword=0

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/ipmanagedclient.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 267-273 def open(self):	Link Here

267

		self.save()

269

		self.save()

268

270

269

	def _ldap_pre_create(self):

271

	def _ldap_pre_create(self):

270

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

272

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

271

		self.nagios_ldap_pre_create()

273

		self.nagios_ldap_pre_create()

272

		univention.admin.handlers.simpleComputer._ldap_pre_create( self )

274

		univention.admin.handlers.simpleComputer._ldap_pre_create( self )

273

275

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/linux.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 413-419 def open(self):	Link Here

413

415

414

416

415

	def _ldap_pre_create(self):

417

	def _ldap_pre_create(self):

416

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

418

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

417

		if not self['password']:

419

		if not self['password']:

418

			self['password']=self.oldattr.get('password',[''])[0]

420

			self['password']=self.oldattr.get('password',[''])[0]

419

			self.modifypassword=0

421

			self.modifypassword=0

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/macos.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 425-431 def open(self):	Link Here

425

427

426

428

427

	def _ldap_pre_create(self):

429

	def _ldap_pre_create(self):

428

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

430

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

429

		if not self['password']:

431

		if not self['password']:

430

			self['password']=self.oldattr.get('password',[''])[0]

432

			self['password']=self.oldattr.get('password',[''])[0]

431

			self.modifypassword=0

433

			self.modifypassword=0

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/memberserver.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 478-484 def open(self):	Link Here

478

480

479

481

480

	def _ldap_pre_create(self):

482

	def _ldap_pre_create(self):

481

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

483

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

482

		if not self['password']:

484

		if not self['password']:

483

			self['password']=self.oldattr.get('password',[''])[0]

485

			self['password']=self.oldattr.get('password',[''])[0]

484

			self.modifypassword=0

486

			self.modifypassword=0

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/trustaccount.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.config

import univention.admin.config

Lines 126-132 def open(self):	Link Here

126

		self.save()

128

		self.save()

127

129

128

	def _ldap_pre_create(self):

130

	def _ldap_pre_create(self):

129

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

131

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

130

132

131

	def _ldap_addlist(self):

133

	def _ldap_addlist(self):

132

134

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/ubuntu.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 413-419 def open(self):	Link Here

413

415

414

416

415

	def _ldap_pre_create(self):

417

	def _ldap_pre_create(self):

416

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

418

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

417

		if not self['password']:

419

		if not self['password']:

418

			self['password']=self.oldattr.get('password',[''])[0]

420

			self['password']=self.oldattr.get('password',[''])[0]

419

			self.modifypassword=0

421

			self.modifypassword=0

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/windows.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 442-448 def open(self):	Link Here

442

444

443

445

444

	def _ldap_pre_create(self):

446

	def _ldap_pre_create(self):

445

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

447

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

446

		if not self['password']:

448

		if not self['password']:

447

			self['password']=self.oldattr.get('password',[''])[0]

449

			self['password']=self.oldattr.get('password',[''])[0]

448

			self.modifypassword=0

450

			self.modifypassword=0

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/windows_domaincontroller.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 451-457 def open(self):	Link Here

451

453

452

454

453

	def _ldap_pre_create(self):

455

	def _ldap_pre_create(self):

454

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

456

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

455

		if not self['password']:

457

		if not self['password']:

456

			self['password']=self.oldattr.get('password',[''])[0]

458

			self['password']=self.oldattr.get('password',[''])[0]

457

			self.modifypassword=0

459

			self.modifypassword=0

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/container/cn.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.uldap

import univention.admin.uldap

import univention.admin.syntax

import univention.admin.syntax

Lines 245-251 def open(self):	Link Here

245

		self.save()

247

		self.save()

246

248

247

	def _ldap_pre_create(self):

249

	def _ldap_pre_create(self):

248

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

250

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

249

251

250

	def _ldap_post_create(self):

252

	def _ldap_post_create(self):

251

		changes=[]

253

		changes=[]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/container/dc.py (-1 / +1 lines)

Lines 213-219 def open(self):	Link Here

213

				iself._remove_option('kerberos')

213

				iself._remove_option('kerberos')

214

215

	def _ldap_pre_create(self):

215

	def _ldap_pre_create(self):

216

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

216

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

217

218

	def _ldap_addlist(self):

218

	def _ldap_addlist(self):

219

		ocs=['top', 'domain', 'sambaDomain', 'univentionDomain', 'univentionBase']

219

		ocs=['top', 'domain', 'sambaDomain', 'univentionDomain', 'univentionBase']

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/container/ou.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

from univention.admin import configRegistry

from univention.admin import configRegistry

import univention.admin.uldap

import univention.admin.uldap

Lines 247-253 def open(self):	Link Here

247

		self.save()

249

		self.save()

248

250

249

	def _ldap_pre_create(self):

251

	def _ldap_pre_create(self):

250

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

252

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

251

		if configRegistry.is_false('directory/manager/child/cn/ou', True):

253

		if configRegistry.is_false('directory/manager/child/cn/ou', True):

252

			if self.position.getDn() != configRegistry.get('ldap/base'):

254

			if self.position.getDn() != configRegistry.get('ldap/base'):

253

				# it is possible to have a basedn with cn=foo

255

				# it is possible to have a basedn with cn=foo

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/host.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 132-138 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

132

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

134

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

133

135

134

	def _ldap_pre_create(self):

136

	def _ldap_pre_create(self):

135

		self.dn='%s=%s,%s' % (mapping.mapName('host'), mapping.mapValue('host', self.info['host']), self.position.getDn())

137

		self.dn = '%s=%s,%s' % (mapping.mapName('host'), ldap.dn.escape_dn_chars(mapping.mapValue('host', self.info['host'])), self.position.getDn())

136

138

137

	def _ldap_addlist(self):

139

	def _ldap_addlist(self):

138

		return [

140

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/pool.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import copy

import copy

import string

import string

Lines 191-197 def open(self):	Link Here

191

193

192

194

193

	def _ldap_pre_create(self):

195

	def _ldap_pre_create(self):

194

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

196

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

195

197

196

	def _ldap_addlist(self):

198

	def _ldap_addlist(self):

197

		return [

199

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/server.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 96-102 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

	def _ldap_pre_create(self):

100

	def _ldap_pre_create(self):

		self.dn='%s=%s,%s' % (mapping.mapName('server'), mapping.mapValue('server', self.info['server']), self.position.getDn())

101

		self.dn = '%s=%s,%s' % (mapping.mapName('server'), ldap.dn.escape_dn_chars(mapping.mapValue('server', self.info['server'])), self.position.getDn())

100

102

101

	def _ldap_addlist(self):

103

	def _ldap_addlist(self):

102

		searchBase=self.position.getDomain()

104

		searchBase=self.position.getDomain()

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/service.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 91-97 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

	def _ldap_pre_create(self):

	def _ldap_pre_create(self):

		self.dn='%s=%s,%s' % (mapping.mapName('service'), mapping.mapValue('service', self.info['service']), self.position.getDn())

		self.dn = '%s=%s,%s' % (mapping.mapName('service'), ldap.dn.escape_dn_chars(mapping.mapValue('service', self.info['service'])), self.position.getDn())

	def _ldap_addlist(self):

	def _ldap_addlist(self):

		return [

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/shared.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 97-103 def open(self):	Link Here

		self.save()

		self.save()

100

	def _ldap_pre_create(self):

101

	def _ldap_pre_create(self):

100

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

102

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

101

103

102

	def _ldap_addlist(self):

104

	def _ldap_addlist(self):

103

		return [

105

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import string

import string

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

Lines 141-147 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

141

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

143

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

142

144

143

	def _ldap_pre_create(self):

145

	def _ldap_pre_create(self):

144

		self.dn='%s=%s,%s' % (mapping.mapName('subnet'), mapping.mapValue('subnet', self.info['subnet']), self.position.getDn())

146

		self.dn = '%s=%s,%s' % (mapping.mapName('subnet'), ldap.dn.escape_dn_chars(mapping.mapValue('subnet', self.info['subnet'])), self.position.getDn())

145

147

146

	def _ldap_addlist(self):

148

	def _ldap_addlist(self):

147

		return [

149

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/subnet.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import string

import string

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

Lines 148-154 def open(self):	Link Here

148

150

149

151

150

	def _ldap_pre_create(self):

152

	def _ldap_pre_create(self):

151

		self.dn='%s=%s,%s' % (mapping.mapName('subnet'), mapping.mapValue('subnet', self.info['subnet']), self.position.getDn())

153

		self.dn = '%s=%s,%s' % (mapping.mapName('subnet'), ldap.dn.escape_dn_chars(mapping.mapValue('subnet', self.info['subnet'])), self.position.getDn())

152

154

153

	def _ldap_addlist(self):

155

	def _ldap_addlist(self):

154

		return [

156

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/alias.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import re

import re

import string

import string

Lines 123-129 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [],	Link Here

123

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

125

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

124

126

125

	def _ldap_pre_create(self):

127

	def _ldap_pre_create(self):

126

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self['name']), self.position.getDn())

128

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self['name'])), self.position.getDn())

127

129

128

	def _ldap_addlist(self):

130

	def _ldap_addlist(self):

129

		return [

131

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/forward_zone.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import ipaddr

import ipaddr

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

Lines 273-279 def open(self):	Link Here

273

		self.save()

275

		self.save()

274

276

275

	def _ldap_pre_create(self):

277

	def _ldap_pre_create(self):

276

		self.dn='%s=%s,%s' % (mapping.mapName('zone'), mapping.mapValue('zone', self.info['zone']), self.position.getDn())

278

		self.dn = '%s=%s,%s' % (mapping.mapName('zone'), ldap.dn.escape_dn_chars(mapping.mapValue('zone', self.info['zone'])), self.position.getDn())

277

279

278

	def _ldap_addlist(self):

280

	def _ldap_addlist(self):

279

		return [

281

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/host_record.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import ipaddr

import ipaddr

import string

import string

Lines 174-180 def open(self):	Link Here

174

			self.info['a'].extend(   map(lambda x: ipaddr.IPv6Address(x).exploded, self.oldattr['aAAARecord']))

176

			self.info['a'].extend(   map(lambda x: ipaddr.IPv6Address(x).exploded, self.oldattr['aAAARecord']))

175

177

176

	def _ldap_pre_create(self):

178

	def _ldap_pre_create(self):

177

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self['name']), self.position.getDn())

179

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self['name'])), self.position.getDn())

178

180

179

	def _ldap_addlist(self):

181

	def _ldap_addlist(self):

180

		return [

182

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/ptr_record.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin

import univention.admin

import univention.admin.handlers

import univention.admin.handlers

Lines 104-110 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [],	Link Here

104

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

106

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

105

107

106

	def _ldap_pre_create(self):

108

	def _ldap_pre_create(self):

107

		self.dn='%s=%s,%s' % (mapping.mapName('address'), mapping.mapValue('address', self['address']), self.position.getDn())

109

		self.dn = '%s=%s,%s' % (mapping.mapName('address'), ldap.dn.escape_dn_chars(mapping.mapValue('address', self['address'])), self.position.getDn())

108

110

109

	def _ldap_addlist(self):

111

	def _ldap_addlist(self):

110

		return [

112

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/reverse_zone.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

from univention.admin import configRegistry

from univention.admin import configRegistry

Lines 244-250 def open(self):	Link Here

244

		self.save()

246

		self.save()

245

247

246

	def _ldap_pre_create(self):

248

	def _ldap_pre_create(self):

247

		self.dn='%s=%s,%s' % (mapping.mapName('subnet'), mapping.mapValue('subnet', self.info['subnet']), self.position.getDn())

249

		self.dn = '%s=%s,%s' % (mapping.mapName('subnet'), ldap.dn.escape_dn_chars(mapping.mapValue('subnet', self.info['subnet'])), self.position.getDn())

248

250

249

	def _ldap_modlist(self):

251

	def _ldap_modlist(self):

250

		ml=univention.admin.handlers.simpleLdap._ldap_modlist(self)

252

		ml=univention.admin.handlers.simpleLdap._ldap_modlist(self)

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/srv_record.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import string

import string

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

Lines 145-151 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [],	Link Here

145

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

147

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

146

148

147

	def _ldap_pre_create(self):

149

	def _ldap_pre_create(self):

148

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self['name']), self.position.getDn())

150

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self['name'])), self.position.getDn())

149

151

150

	def _ldap_addlist(self):

152

	def _ldap_addlist(self):

151

		return [

153

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/txt_record.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import string

import string

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

Lines 119-125 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [],	Link Here

119

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

121

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

120

122

121

	def _ldap_pre_create(self):

123

	def _ldap_pre_create(self):

122

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self['name']), self.position.getDn())

124

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self['name'])), self.position.getDn())

123

125

124

	def _ldap_addlist(self):

126

	def _ldap_addlist(self):

125

		return [

127

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/groups/group.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import copy

import copy

import time

import time

import ldap

import ldap

Lines 535-541 def _check_uid_gid_uniqueness(self):	Link Here

535

				raise univention.admin.uexceptions.gidNumberAlreadyUsedAsUidNumber, '%r' % self["gidNumber"]

537

				raise univention.admin.uexceptions.gidNumberAlreadyUsedAsUidNumber, '%r' % self["gidNumber"]

536

538

537

	def _ldap_pre_create(self):

539

	def _ldap_pre_create(self):

538

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

540

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

539

		self.check_for_group_recursion()

541

		self.check_for_group_recursion()

540

		self._check_uid_gid_uniqueness()

542

		self._check_uid_gid_uniqueness()

541

543

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/kerberos/kdcentry.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 197-203 def _set_principal(self):	Link Here

197

199

198

	def _ldap_pre_create(self):

200

	def _ldap_pre_create(self):

199

		self._set_principal()

201

		self._set_principal()

200

		self.dn='krb5PrincipalName=%s,%s' % (self.krb5PrincipalName, self.position.getDn())

202

		self.dn = 'krb5PrincipalName=%s,%s' % (ldap.dn.escape_dn_chars(self.krb5PrincipalName), self.position.getDn())

201

203

202

	def _ldap_modlist( self ):

204

	def _ldap_modlist( self ):

203

		ml=univention.admin.handlers.simpleLdap._ldap_modlist( self )

205

		ml=univention.admin.handlers.simpleLdap._ldap_modlist( self )

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/computers/managedclient.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 424-430 def open(self):	Link Here

424

#		self.save()

426

#		self.save()

425

427

426

	def _ldap_pre_create(self):

428

	def _ldap_pre_create(self):

427

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

429

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

428

		if not self['password']:

430

		if not self['password']:

429

			self['password']=self.oldattr.get('password',[''])[0]

431

			self['password']=self.oldattr.get('password',[''])[0]

430

			self.modifypassword=0

432

			self.modifypassword=0

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/computers/mobileclient.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 421-427 def open(self):	Link Here

421

#		self.save()

423

#		self.save()

422

424

423

	def _ldap_pre_create(self):

425

	def _ldap_pre_create(self):

424

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

426

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

425

		if not self['password']:

427

		if not self['password']:

426

			self['password']=self.oldattr.get('password',[''])[0]

428

			self['password']=self.oldattr.get('password',[''])[0]

427

			self.modifypassword=0

429

			self.modifypassword=0

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/computers/thinclient.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 264-270 def open(self):	Link Here

264

		self.save()

266

		self.save()

265

267

266

	def _ldap_pre_create(self):

268

	def _ldap_pre_create(self):

267

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

269

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

268

		univention.admin.handlers.simpleComputer._ldap_pre_create( self )

270

		univention.admin.handlers.simpleComputer._ldap_pre_create( self )

269

271

270

	def _ldap_pre_modify(self):

272

	def _ldap_pre_modify(self):

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/clientdevices.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 124-130 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

124

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

126

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

125

127

126

	def _ldap_pre_create(self):

128

	def _ldap_pre_create(self):

127

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

129

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

128

130

129

	def _ldap_addlist(self):

131

	def _ldap_addlist(self):

130

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyClientDevices']) ]

132

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyClientDevices']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/managedclientpackages.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 137-143 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

137

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

139

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

138

140

139

	def _ldap_pre_create(self):

141

	def _ldap_pre_create(self):

140

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

142

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

141

143

142

	def _ldap_addlist(self):

144

	def _ldap_addlist(self):

143

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyPackagesClient']) ]

145

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyPackagesClient']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/mobileclientpackages.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 137-143 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

137

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

139

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

138

140

139

	def _ldap_pre_create(self):

141

	def _ldap_pre_create(self):

140

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

142

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

141

143

142

	def _ldap_addlist(self):

144

	def _ldap_addlist(self):

143

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyPackagesMobileClient']) ]

145

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyPackagesMobileClient']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/sound.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 138-144 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

138

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

140

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

139

141

140

	def _ldap_pre_create(self):

142

	def _ldap_pre_create(self):

141

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

143

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

142

144

143

	def _ldap_addlist(self):

145

	def _ldap_addlist(self):

144

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicySoundConfiguration']) ]

146

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicySoundConfiguration']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/thinclient.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 175-181 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

175

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

177

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

176

178

177

	def _ldap_pre_create(self):

179

	def _ldap_pre_create(self):

178

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

180

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

179

181

180

	def _ldap_addlist(self):

182

	def _ldap_addlist(self):

181

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyThinClient']) ]

183

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyThinClient']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/xfree.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 429-435 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

429

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes)

431

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes)

430

432

431

	def _ldap_pre_create(self):

433

	def _ldap_pre_create(self):

432

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

434

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

433

435

434

	def _ldap_addlist(self):

436

	def _ldap_addlist(self):

435

		return [

437

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/mail/domain.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 94-100 def open(self):	Link Here

		univention.admin.handlers.simpleLdap.open(self)

		univention.admin.handlers.simpleLdap.open(self)

	def _ldap_pre_create(self):

	def _ldap_pre_create(self):

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name'].lower()), self.position.getDn())

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'].lower())), self.position.getDn())

100

	def _ldap_addlist(self):

101

	def _ldap_addlist(self):

100

		ocs=[]

102

		ocs=[]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/mail/folder.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 204-210 def description( self ):	Link Here

204

		return '%s@%s' % ( self[ 'name' ], self[ 'mailDomain' ] )

206

		return '%s@%s' % ( self[ 'name' ], self[ 'mailDomain' ] )

205

207

206

	def _ldap_pre_create(self):

208

	def _ldap_pre_create(self):

207

		self.dn='cn=%s@%s,%s' % (self.info['name'], self.info['mailDomain'], self.position.getDn())

209

		self.dn = 'cn=%s@%s,%s' % (ldap.dn.escape_dn_chars(self.info['name']), ldap.dn.escape_dn_chars(self.info['mailDomain']), self.position.getDn())

208

210

209

	def _ldap_post_create(self):

211

	def _ldap_post_create(self):

210

		if self[ 'mailPrimaryAddress' ]:

212

		if self[ 'mailPrimaryAddress' ]:

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/mail/lists.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 165-171 def open(self):	Link Here

165

		self.save()

167

		self.save()

166

168

167

	def _ldap_pre_create(self):

169

	def _ldap_pre_create(self):

168

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

170

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

169

171

170

	def _ldap_post_create(self):

172

	def _ldap_post_create(self):

171

		if self[ 'mailAddress' ]:

173

		if self[ 'mailAddress' ]:

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/nagios/service.py (-1 / +3 lines)

Lines 31-36	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import re

import re

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

Lines 340-346 def open(self):	Link Here

340

		self.save()

342

		self.save()

341

343

342

	def _ldap_pre_create(self):

344

	def _ldap_pre_create(self):

343

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

345

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

344

346

345

	def _ldap_post_create(self):

347

	def _ldap_post_create(self):

346

		pass

348

		pass

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/nagios/timeperiod.py (-1 / +3 lines)

Lines 31-36	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import re

import re

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

Lines 216-222 def open(self):	Link Here

216

		self.save()

218

		self.save()

217

219

218

	def _ldap_pre_create(self):

220

	def _ldap_pre_create(self):

219

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

221

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

220

222

221

	def _ldap_post_create(self):

223

	def _ldap_post_create(self):

222

		pass

224

		pass

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/networks/network.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import ipaddr

import ipaddr

import string

import string

import ldap

import ldap

Lines 250-256 def _ldap_post_remove(self):	Link Here

250

				univention.debug.debug(univention.debug.ADMIN, univention.debug.ERROR, 'Failed to remove network %s from %s: %s' % (self.dn, computer.dn, traceback.format_exc()))

252

				univention.debug.debug(univention.debug.ADMIN, univention.debug.ERROR, 'Failed to remove network %s from %s: %s' % (self.dn, computer.dn, traceback.format_exc()))

251

253

252

	def _ldap_pre_create(self):

254

	def _ldap_pre_create(self):

253

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

255

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

254

256

255

	def _ldap_addlist(self):

257

	def _ldap_addlist(self):

256

		if not self['nextIp']:

258

		if not self['nextIp']:

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/admin_container.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 126-132 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

126

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

128

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

127

129

128

	def _ldap_pre_create(self):

130

	def _ldap_pre_create(self):

129

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

131

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

130

132

131

	def _ldap_addlist(self):

133

	def _ldap_addlist(self):

132

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyAdminContainerSettings']) ]

134

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyAdminContainerSettings']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/autostart.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 125-131 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

125

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

127

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

126

128

127

	def _ldap_pre_create(self):

129

	def _ldap_pre_create(self):

128

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

130

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

129

131

130

	def _ldap_addlist(self):

132

	def _ldap_addlist(self):

131

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyAutoStart']) ]

133

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyAutoStart']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/desktop.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 164-170 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

164

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

166

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

165

167

166

	def _ldap_pre_create(self):

168

	def _ldap_pre_create(self):

167

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

169

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

168

170

169

	def _ldap_addlist(self):

171

	def _ldap_addlist(self):

170

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyDesktop']) ]

172

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyDesktop']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_boot.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 140-146 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

140

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

142

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

141

143

142

	def _ldap_pre_create(self):

144

	def _ldap_pre_create(self):

143

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

145

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

144

146

145

	def _ldap_addlist(self):

147

	def _ldap_addlist(self):

146

		return [

148

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_dns.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 140-146 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

140

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

142

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

141

143

142

	def _ldap_pre_create(self):

144

	def _ldap_pre_create(self):

143

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

145

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

144

146

145

	def _ldap_addlist(self):

147

	def _ldap_addlist(self):

146

		return [

148

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_dnsupdate.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 215-221 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

215

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

217

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

216

218

217

	def _ldap_pre_create(self):

219

	def _ldap_pre_create(self):

218

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

220

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

219

221

220

	def _ldap_addlist(self):

222

	def _ldap_addlist(self):

221

		return [

223

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_leasetime.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 160-166 def __setitem__(self, key, value):	Link Here

160

				univention.admin.handlers.simplePolicy.__setitem__(self, key, value)

162

				univention.admin.handlers.simplePolicy.__setitem__(self, key, value)

161

163

162

	def _ldap_pre_create(self):

164

	def _ldap_pre_create(self):

163

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

165

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

164

166

165

	def _ldap_addlist(self):

167

	def _ldap_addlist(self):

166

		return [

168

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_netbios.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 152-158 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

152

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

154

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

153

155

154

	def _ldap_pre_create(self):

156

	def _ldap_pre_create(self):

155

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

157

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

156

158

157

	def _ldap_addlist(self):

159

	def _ldap_addlist(self):

158

		return [

160

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_routing.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 127-133 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

127

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

129

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

128

130

129

	def _ldap_pre_create(self):

131

	def _ldap_pre_create(self):

130

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

132

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

131

133

132

	def _ldap_addlist(self):

134

	def _ldap_addlist(self):

133

		return [

135

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_scope.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 177-183 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

177

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

179

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

178

180

179

	def _ldap_pre_create(self):

181

	def _ldap_pre_create(self):

180

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

182

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

181

183

182

	def _ldap_addlist(self):

184

	def _ldap_addlist(self):

183

		return [

185

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_statements.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 189-195 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

189

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

191

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

190

192

191

	def _ldap_pre_create(self):

193

	def _ldap_pre_create(self):

192

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

194

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

193

195

194

	def _ldap_addlist(self):

196

	def _ldap_addlist(self):

195

		return [

197

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/ldapserver.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 128-134 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

128

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

130

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

129

131

130

	def _ldap_pre_create(self):

132

	def _ldap_pre_create(self):

131

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

133

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

132

134

133

	def _ldap_addlist(self):

135

	def _ldap_addlist(self):

134

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyLDAPServer']) ]

136

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyLDAPServer']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/maintenance.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 251-257 def __getitem__(self, key):	Link Here

251

		return value

253

		return value

252

254

253

	def _ldap_pre_create(self):

255

	def _ldap_pre_create(self):

254

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

256

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

255

257

256

	def _ldap_addlist(self):

258

	def _ldap_addlist(self):

257

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyInstallationTime']) ]

259

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyInstallationTime']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/masterpackages.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 141-147 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

141

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

143

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

142

144

143

	def _ldap_pre_create(self):

145

	def _ldap_pre_create(self):

144

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

146

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

145

147

146

	def _ldap_addlist(self):

148

	def _ldap_addlist(self):

147

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyPackagesMaster']) ]

149

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyPackagesMaster']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/memberpackages.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 141-147 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

141

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

143

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

142

144

143

	def _ldap_pre_create(self):

145

	def _ldap_pre_create(self):

144

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

146

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

145

147

146

	def _ldap_addlist(self):

148

	def _ldap_addlist(self):

147

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyPackagesMember']) ]

149

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyPackagesMember']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/nfsmounts.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 134-140 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

134

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

136

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

135

137

136

	def _ldap_pre_create(self):

138

	def _ldap_pre_create(self):

137

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

139

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

138

140

139

	def _ldap_addlist(self):

141

	def _ldap_addlist(self):

140

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyNFSMounts']) ]

142

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyNFSMounts']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/print_quota.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 168-174 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

168

170

169

171

170

	def _ldap_pre_create(self):

172

	def _ldap_pre_create(self):

171

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

173

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

172

		self.check_entries()

174

		self.check_entries()

173

175

174

	def _ldap_pre_modify(self):

176

	def _ldap_pre_modify(self):

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/printserver.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 128-134 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

128

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

130

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

129

131

130

	def _ldap_pre_create(self):

132

	def _ldap_pre_create(self):

131

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

133

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

132

134

133

	def _ldap_addlist(self):

135

	def _ldap_addlist(self):

134

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyPrintServer']) ]

136

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyPrintServer']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/pwhistory.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 166-172 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

166

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

168

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

167

169

168

	def _ldap_pre_create(self):

170

	def _ldap_pre_create(self):

169

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

171

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

170

172

171

	def _ldap_addlist(self):

173

	def _ldap_addlist(self):

172

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyPWHistory']) ]

174

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyPWHistory']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/registry.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 181-187 def _custom_policy_result_map( self ):	Link Here

181

		self.polinfo = self._post_unmap( self.polinfo, values )

183

		self.polinfo = self._post_unmap( self.polinfo, values )

182

184

183

	def _ldap_pre_create(self):

185

	def _ldap_pre_create(self):

184

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

186

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

185

187

186

	def _ldap_addlist(self):

188

	def _ldap_addlist(self):

187

		return [

189

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/release.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 140-146 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

140

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

142

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

141

143

142

	def _ldap_pre_create(self):

144

	def _ldap_pre_create(self):

143

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

145

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

144

146

145

	def _ldap_addlist(self):

147

	def _ldap_addlist(self):

146

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyUpdate']) ]

148

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyUpdate']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/repositoryserver.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 129-135 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

129

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

131

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

130

132

131

	def _ldap_pre_create(self):

133

	def _ldap_pre_create(self):

132

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

134

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

133

135

134

	def _ldap_addlist(self):

136

	def _ldap_addlist(self):

135

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyRepositoryServer']) ]

137

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyRepositoryServer']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/repositorysync.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 205-211 def __getitem__(self, key):	Link Here

205

207

206

208

207

	def _ldap_pre_create(self):

209

	def _ldap_pre_create(self):

208

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

210

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

209

211

210

	def _ldap_addlist(self):

212

	def _ldap_addlist(self):

211

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyRepositorySync']) ]

213

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyRepositorySync']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/share_userquota.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 179-185 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

179

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

181

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

180

182

181

	def _ldap_pre_create(self):

183

	def _ldap_pre_create(self):

182

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

184

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

183

185

184

	def _ldap_addlist(self):

186

	def _ldap_addlist(self):

185

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyShareUserQuota']) ]

187

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyShareUserQuota']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/slavepackages.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 141-147 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

141

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

143

		univention.admin.handlers.simplePolicy.__init__(self, co, lo, position, dn, superordinate, attributes )

142

144

143

	def _ldap_pre_create(self):

145

	def _ldap_pre_create(self):

144

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

146

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

145

147

146

	def _ldap_addlist(self):

148

	def _ldap_addlist(self):

147

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyPackagesSlave']) ]

149

		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyPackagesSlave']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/umc.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax as udm_syntax

import univention.admin.syntax as udm_syntax

import univention.admin.filter as udm_filter

import univention.admin.filter as udm_filter

Lines 128-134 def __init__( self, co, lo, position, dn = '', superordinate = None, attributes	Link Here

128

		simplePolicy.__init__( self, co, lo, position, dn, superordinate, attributes )

130

		simplePolicy.__init__( self, co, lo, position, dn, superordinate, attributes )

129

131

130

	def _ldap_pre_create( self ):

132

	def _ldap_pre_create( self ):

131

		self.dn = '%s=%s,%s' % (mapping.mapName( 'name' ), mapping.mapValue( 'name', self.info[ 'name' ] ), self.position.getDn() )

133

		self.dn = '%s=%s,%s' % (mapping.mapName( 'name' ), ldap.dn.escape_dn_chars(mapping.mapValue( 'name', self.info[ 'name' ] )), self.position.getDn() )

132

134

133

	def _ldap_addlist( self ):

135

	def _ldap_addlist( self ):

134

		return [ ( 'objectClass', [ 'top', 'univentionPolicy', 'umcPolicy' ] ) ]

136

		return [ ( 'objectClass', [ 'top', 'univentionPolicy', 'umcPolicy' ] ) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/cn.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.uldap

import univention.admin.uldap

import univention.admin.syntax

import univention.admin.syntax

Lines 81-87 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

	def _ldap_pre_create(self):

	def _ldap_pre_create(self):

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

	def _ldap_addlist(self):

	def _ldap_addlist(self):

		return [

		return [

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/default.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.handlers

import univention.admin.handlers

import univention.admin.password

import univention.admin.password

Lines 186-192 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

186

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

188

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

187

189

188

	def _ldap_pre_create(self):

190

	def _ldap_pre_create(self):

189

		self.dn='cn=default containers,cn=univention,%s' % (self.position.getDomain())

191

		self.dn = 'cn=default containers,cn=univention,%s' % (self.position.getDomain())

190

192

191

	def _ldap_addlist(self):

193

	def _ldap_addlist(self):

192

		return [('objectClass', ['top', 'univentionDefault'] ) ]

194

		return [('objectClass', ['top', 'univentionDefault'] ) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/directory.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 243-249 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

243

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

245

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

244

246

245

	def _ldap_pre_create(self):

247

	def _ldap_pre_create(self):

246

		self.dn='cn=%s,cn=univention,%s' % (self['name'], self.position.getDomain())

248

		self.dn = 'cn=%s,cn=univention,%s' % (ldap.dn.escape_dn_chars(self['name']), self.position.getDomain())

247

249

248

	def _ldap_addlist(self):

250

	def _ldap_addlist(self):

249

		return [('objectClass', ['top', 'univentionDirectory'] ) ]

251

		return [('objectClass', ['top', 'univentionDirectory'] ) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/extended_attribute.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 463-469 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

463

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

465

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

464

466

465

	def _ldap_pre_create(self):

467

	def _ldap_pre_create(self):

466

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

468

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

467

469

468

	def _ldap_addlist(self):

470

	def _ldap_addlist(self):

469

		return [('objectClass', ['top', 'univentionUDMProperty'] ) ]

471

		return [('objectClass', ['top', 'univentionUDMProperty'] ) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/extended_options.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 183-189 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

183

185

184

	def _ldap_pre_create(self):

186

	def _ldap_pre_create(self):

185

		"""Create DN."""

187

		"""Create DN."""

186

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

188

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

187

189

188

	def _ldap_addlist(self):

190

	def _ldap_addlist(self):

189

		"""Add initial objectClasses."""

191

		"""Add initial objectClasses."""

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/ldapacl.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import os

import os

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

Lines 200-206 def open(self):	Link Here

200

		univention.admin.handlers.simpleLdap.open(self)

202

		univention.admin.handlers.simpleLdap.open(self)

201

203

202

	def _ldap_pre_create(self):

204

	def _ldap_pre_create(self):

203

		self.dn='cn=%s,%s' % ( mapping.mapValue('name', self.info['name']), self.position.getDn())

205

		self.dn = 'cn=%s,%s' % ( ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

204

206

205

	def _ldap_addlist(self):

207

	def _ldap_addlist(self):

206

		ocs=['top', 'univentionObjectMetadata', OC]

208

		ocs=['top', 'univentionObjectMetadata', OC]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/ldapschema.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import os

import os

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

Lines 174-180 def open(self):	Link Here

174

		univention.admin.handlers.simpleLdap.open(self)

176

		univention.admin.handlers.simpleLdap.open(self)

175

177

176

	def _ldap_pre_create(self):

178

	def _ldap_pre_create(self):

177

		self.dn='cn=%s,%s' % ( mapping.mapValue('name', self.info['name']), self.position.getDn())

179

		self.dn = 'cn=%s,%s' % ( ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

178

180

179

	def _ldap_addlist(self):

181

	def _ldap_addlist(self):

180

		ocs=['top', 'univentionObjectMetadata', OC]

182

		ocs=['top', 'univentionObjectMetadata', OC]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/license.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 368-374 def open(self):	Link Here

368

		self.save()

370

		self.save()

369

371

370

	def _ldap_pre_create(self):

372

	def _ldap_pre_create(self):

371

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

373

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

372

374

373

	def _ldap_addlist(self):

375

	def _ldap_addlist(self):

374

		return [ ('objectClass', ['top', 'univentionLicense']) ]

376

		return [ ('objectClass', ['top', 'univentionLicense']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/packages.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 101-107 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

101

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

103

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

102

104

103

	def _ldap_pre_create(self):

105

	def _ldap_pre_create(self):

104

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

106

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

105

107

106

	def _ldap_addlist(self):

108

	def _ldap_addlist(self):

107

		return [ ('objectClass', ['top', 'univentionPackageList']) ]

109

		return [ ('objectClass', ['top', 'univentionPackageList']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/printermodel.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import shlex

import shlex

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

Lines 114-120 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

114

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

116

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

115

117

116

	def _ldap_pre_create(self):

118

	def _ldap_pre_create(self):

117

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

119

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

118

120

119

	def _ldap_addlist(self):

121

	def _ldap_addlist(self):

120

		return [ ('objectClass', ['top', 'univentionPrinterModels']) ]

122

		return [ ('objectClass', ['top', 'univentionPrinterModels']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/printeruri.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 103-109 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

103

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

105

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

104

106

105

	def _ldap_pre_create(self):

107

	def _ldap_pre_create(self):

106

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

108

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

107

109

108

	def _ldap_addlist(self):

110

	def _ldap_addlist(self):

109

		return [ ('objectClass', ['top', 'univentionPrinterURIs']) ]

111

		return [ ('objectClass', ['top', 'univentionPrinterURIs']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/prohibited_username.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.syntax

import univention.admin.syntax

import univention.admin.filter

import univention.admin.filter

Lines 101-107 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

101

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

103

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

102

104

103

	def _ldap_pre_create(self):

105

	def _ldap_pre_create(self):

104

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

106

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

105

107

106

	def _ldap_addlist(self):

108

	def _ldap_addlist(self):

107

		return [ ('objectClass', ['top', 'univentionProhibitedUsernames']) ]

109

		return [ ('objectClass', ['top', 'univentionProhibitedUsernames']) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/sambaconfig.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 225-231 def open(self):	Link Here

225

		univention.admin.handlers.simpleLdap.open(self)

227

		univention.admin.handlers.simpleLdap.open(self)

226

228

227

	def _ldap_pre_create(self):

229

	def _ldap_pre_create(self):

228

		self.dn='cn=%s,%s' % ( mapping.mapValue('name', self.info['name']), self.position.getDn())

230

		self.dn = 'cn=%s,%s' % ( ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

229

231

230

	def _ldap_addlist(self):

232

	def _ldap_addlist(self):

231

		ocs=['top', 'univentionSambaConfig']

233

		ocs=['top', 'univentionSambaConfig']

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/sambadomain.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import os

import os

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

Lines 332-338 def open(self):	Link Here

332

				self['domainPasswordStoreCleartext'] = '1'

334

				self['domainPasswordStoreCleartext'] = '1'

333

335

334

	def _ldap_pre_create(self):

336

	def _ldap_pre_create(self):

335

		self.dn='sambaDomainName=%s,%s' % ( mapping.mapValue('name', self.info['name']), self.position.getDn())

337

		self.dn = 'sambaDomainName=%s,%s' % ( ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

336

		self.__update_password_properties()

338

		self.__update_password_properties()

337

339

338

	def _ldap_pre_modify(self):

340

	def _ldap_pre_modify(self):

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/service.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 91-97 def open(self):	Link Here

		univention.admin.handlers.simpleLdap.open(self)

		univention.admin.handlers.simpleLdap.open(self)

	def _ldap_pre_create(self):

	def _ldap_pre_create(self):

		self.dn='cn=%s,%s' % ( mapping.mapValue('name', self.info['name']), self.position.getDn())

		self.dn = 'cn=%s,%s' % ( ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

	def _ldap_addlist(self):

	def _ldap_addlist(self):

		ocs=['univentionServiceObject']

		ocs=['univentionServiceObject']

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/syntax.py (+2 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_hook.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import os

import os

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

Lines 200-206 def open(self):	Link Here

200

		univention.admin.handlers.simpleLdap.open(self)

202

		univention.admin.handlers.simpleLdap.open(self)

201

203

202

	def _ldap_pre_create(self):

204

	def _ldap_pre_create(self):

203

		self.dn='cn=%s,%s' % ( mapping.mapValue('name', self.info['name']), self.position.getDn())

205

		self.dn = 'cn=%s,%s' % ( ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

204

206

205

	def _ldap_addlist(self):

207

	def _ldap_addlist(self):

206

		ocs=['top', 'univentionObjectMetadata', OC]

208

		ocs=['top', 'univentionObjectMetadata', OC]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_module.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 236-242 def open(self):	Link Here

236

		univention.admin.handlers.simpleLdap.open(self)

238

		univention.admin.handlers.simpleLdap.open(self)

237

239

238

	def _ldap_pre_create(self):

240

	def _ldap_pre_create(self):

239

		self.dn='cn=%s,%s' % ( mapping.mapValue('name', self.info['name']), self.position.getDn())

241

		self.dn = 'cn=%s,%s' % ( ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

240

242

241

	def _ldap_addlist(self):

243

	def _ldap_addlist(self):

242

		ocs=['top', 'univentionObjectMetadata', OC]

244

		ocs=['top', 'univentionObjectMetadata', OC]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_syntax.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import os

import os

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

Lines 200-206 def open(self):	Link Here

200

		univention.admin.handlers.simpleLdap.open(self)

202

		univention.admin.handlers.simpleLdap.open(self)

201

203

202

	def _ldap_pre_create(self):

204

	def _ldap_pre_create(self):

203

		self.dn='cn=%s,%s' % ( mapping.mapValue('name', self.info['name']), self.position.getDn())

205

		self.dn = 'cn=%s,%s' % ( ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

204

206

205

	def _ldap_addlist(self):

207

	def _ldap_addlist(self):

206

		ocs=['top', 'univentionObjectMetadata', OC]

208

		ocs=['top', 'univentionObjectMetadata', OC]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/umc_operationset.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter as udm_filter

import univention.admin.filter as udm_filter

import univention.admin.syntax as udm_syntax

import univention.admin.syntax as udm_syntax

Lines 141-147 def __init__( self, co, lo, position, dn = '', superordinate = None, attributes	Link Here

141

		simpleLdap.__init__( self, co, lo, position, dn, superordinate, attributes = attributes )

143

		simpleLdap.__init__( self, co, lo, position, dn, superordinate, attributes = attributes )

142

144

143

	def _ldap_pre_create( self ):

145

	def _ldap_pre_create( self ):

144

		self.dn='%s=%s,%s' % ( mapping.mapName( 'name' ), mapping.mapValue( 'name', self.info[ 'name' ] ), self.position.getDn() )

146

		self.dn = '%s=%s,%s' % ( mapping.mapName( 'name' ), ldap.dn.escape_dn_chars(mapping.mapValue( 'name', self.info[ 'name' ] )), self.position.getDn() )

145

147

146

	def _ldap_addlist( self ):

148

	def _ldap_addlist( self ):

147

		return [ ( 'objectClass', [ 'top', 'umcOperationSet' ] ) ]

149

		return [ ( 'objectClass', [ 'top', 'umcOperationSet' ] ) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/usertemplate.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 453-459 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

453

		mungeddial.Support.__init__( self )

455

		mungeddial.Support.__init__( self )

454

456

455

	def _ldap_pre_create(self):

457

	def _ldap_pre_create(self):

456

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

458

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

457

459

458

	def _ldap_addlist(self):

460

	def _ldap_addlist(self):

459

		return [ ('objectClass', ['top', 'univentionUserTemplate'] ) ]

461

		return [ ('objectClass', ['top', 'univentionUserTemplate'] ) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/xconfig_choices.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers

Lines 205-211 def __init__(self, co, lo, position, dn='', superordinate=None, attributes = []	Link Here

205

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

207

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

206

208

207

	def _ldap_pre_create(self):

209

	def _ldap_pre_create(self):

208

		self.dn='cn=%s,cn=univention,%s' % (self['name'], self.position.getDomain())

210

		self.dn = 'cn=%s,cn=univention,%s' % (ldap.dn.escape_dn_chars(self['name']), self.position.getDomain())

209

211

210

	def _ldap_addlist(self):

212

	def _ldap_addlist(self):

211

		return [('objectClass', ['top', 'univentionXConfigurationChoices'] ) ]

213

		return [('objectClass', ['top', 'univentionXConfigurationChoices'] ) ]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/shares/printer.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import re

import re

import string

import string

Lines 313-319 def open(self):	Link Here

313

		self.save()

315

		self.save()

314

316

315

	def _ldap_pre_create(self):

317

	def _ldap_pre_create(self):

316

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

318

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

317

		# cut off '/' at the beginning of the destination if it exists and protocol is file:/

319

		# cut off '/' at the beginning of the destination if it exists and protocol is file:/

318

		if self[ 'uri' ] and self[ 'uri' ][ 0 ] == 'file:/' and self[ 'uri' ][ 1 ][ 0 ] == '/':

320

		if self[ 'uri' ] and self[ 'uri' ][ 0 ] == 'file:/' and self[ 'uri' ][ 1 ][ 0 ] == '/':

319

			self[ 'uri' ][ 1 ] = re.sub( r'^/+', '', self[ 'uri' ][ 1 ] )

321

			self[ 'uri' ][ 1 ] = re.sub( r'^/+', '', self[ 'uri' ][ 1 ] )

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/shares/printergroup.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import string

import string

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

Lines 174-180 def open(self):	Link Here

174

		self.save()

176

		self.save()

175

177

176

	def _ldap_pre_create(self):

178

	def _ldap_pre_create(self):

177

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

179

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

178

		self.isValidPrinterObject() #check all members

180

		self.isValidPrinterObject() #check all members

179

181

180

182

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/shares/share.py (-1 / +3 lines)

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import re

import re

import copy

import copy

856

		self.save()

858

		self.save()

857

859

858

	def _ldap_pre_create(self):

860

	def _ldap_pre_create(self):

859

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

861

		self.dn = '%s=%s,%s' % (mapping.mapName('name'), ldap.dn.escape_dn_chars(mapping.mapValue('name', self.info['name'])), self.position.getDn())

860

862

861

	def _ldap_addlist(self):

863

	def _ldap_addlist(self):

862

864

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py (-1 / +3 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import ldap

import hashlib

import hashlib

import os

import os

import string

import string

Lines 1776-1782 def _check_uid_gid_uniqueness(self):	Link Here

1776

	def _ldap_pre_create(self):

1778

	def _ldap_pre_create(self):

1777

		_d=univention.debug.function('admin.handlers.users.user.object._ldap_pre_create')

1779

		_d=univention.debug.function('admin.handlers.users.user.object._ldap_pre_create')

1778

1780

1779

		self.dn='uid=%s,%s' % ( self['username'], self.position.getDn())

1781

		self.dn = 'uid=%s,%s' % (ldap.dn.escape_dn_chars(self['username']), self.position.getDn())

1780

		univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'users/user: dn was set to %s'%self.dn)

1782

		univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'users/user: dn was set to %s'%self.dn)

1781

		if not self['password']:

1783

		if not self['password']:

1782

			self['password']=self.oldattr.get('password',[''])[0]

1784

			self['password']=self.oldattr.get('password',[''])[0]

Return to bug 40041