View | Details | Raw Unified | Return to bug 31857 | Differences between
and this patch

Collapse All | Expand All

(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/debian/changelog (+6 lines)
 Lines 1-3    Link Here 
1
univention-directory-manager-modules (10.0.29-53) unstable; urgency=low
2
3
  * Bug #31857: provide list of objectClasses and attributeTypes
4
5
 -- Philipp Hahn <hahn@univention.de>  Thu, 18 Jun 2015 12:25:49 +0200
6
1
univention-directory-manager-modules (10.0.29-52) unstable; urgency=medium
7
univention-directory-manager-modules (10.0.29-52) unstable; urgency=medium
2
8
3
  * Bug #32146: filter duplicated variables, strip out leading/trailing
9
  * Bug #32146: filter duplicated variables, strip out leading/trailing
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/clientdevices.py (-2 / +2 lines)
 Lines 85-91   property_descriptions={ Link Here 
85
	'requiredObjectClasses': univention.admin.property(
85
	'requiredObjectClasses': univention.admin.property(
86
			short_description=_('Required object class'),
86
			short_description=_('Required object class'),
87
			long_description='',
87
			long_description='',
88
			syntax=univention.admin.syntax.string,
88
			syntax=univention.admin.syntax.ldapObjectClass,
89
			multivalue=1,
89
			multivalue=1,
90
			options=[],
90
			options=[],
91
			required=0,
91
			required=0,
 Lines 95-101   property_descriptions={ Link Here 
95
	'prohibitedObjectClasses': univention.admin.property(
95
	'prohibitedObjectClasses': univention.admin.property(
96
			short_description=_('Excluded object class'),
96
			short_description=_('Excluded object class'),
97
			long_description='',
97
			long_description='',
98
			syntax=univention.admin.syntax.string,
98
			syntax=univention.admin.syntax.ldapObjectClass,
99
			multivalue=1,
99
			multivalue=1,
100
			options=[],
100
			options=[],
101
			required=0,
101
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/managedclientpackages.py (-2 / +2 lines)
 Lines 96-102   property_descriptions={ Link Here 
96
	'requiredObjectClasses': univention.admin.property(
96
	'requiredObjectClasses': univention.admin.property(
97
			short_description=_('Required object class'),
97
			short_description=_('Required object class'),
98
			long_description='',
98
			long_description='',
99
			syntax=univention.admin.syntax.string,
99
			syntax=univention.admin.syntax.ldapObjectClass,
100
			multivalue=1,
100
			multivalue=1,
101
			options=[],
101
			options=[],
102
			required=0,
102
			required=0,
 Lines 106-112   property_descriptions={ Link Here 
106
	'prohibitedObjectClasses': univention.admin.property(
106
	'prohibitedObjectClasses': univention.admin.property(
107
			short_description=_('Excluded object class'),
107
			short_description=_('Excluded object class'),
108
			long_description='',
108
			long_description='',
109
			syntax=univention.admin.syntax.string,
109
			syntax=univention.admin.syntax.ldapObjectClass,
110
			multivalue=1,
110
			multivalue=1,
111
			options=[],
111
			options=[],
112
			required=0,
112
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/mobileclientpackages.py (-2 / +2 lines)
 Lines 96-102   property_descriptions={ Link Here 
96
	'requiredObjectClasses': univention.admin.property(
96
	'requiredObjectClasses': univention.admin.property(
97
			short_description=_('Required object class'),
97
			short_description=_('Required object class'),
98
			long_description='',
98
			long_description='',
99
			syntax=univention.admin.syntax.string,
99
			syntax=univention.admin.syntax.ldapObjectClass,
100
			multivalue=1,
100
			multivalue=1,
101
			options=[],
101
			options=[],
102
			required=0,
102
			required=0,
 Lines 106-112   property_descriptions={ Link Here 
106
	'prohibitedObjectClasses': univention.admin.property(
106
	'prohibitedObjectClasses': univention.admin.property(
107
			short_description=_('Excluded object class'),
107
			short_description=_('Excluded object class'),
108
			long_description='',
108
			long_description='',
109
			syntax=univention.admin.syntax.string,
109
			syntax=univention.admin.syntax.ldapObjectClass,
110
			multivalue=1,
110
			multivalue=1,
111
			options=[],
111
			options=[],
112
			required=0,
112
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/sound.py (-2 / +2 lines)
 Lines 97-103   property_descriptions={ Link Here 
97
	'requiredObjectClasses': univention.admin.property(
97
	'requiredObjectClasses': univention.admin.property(
98
			short_description=_('Required object class'),
98
			short_description=_('Required object class'),
99
			long_description='',
99
			long_description='',
100
			syntax=univention.admin.syntax.string,
100
			syntax=univention.admin.syntax.ldapObjectClass,
101
			multivalue=1,
101
			multivalue=1,
102
			options=[],
102
			options=[],
103
			required=0,
103
			required=0,
 Lines 107-113   property_descriptions={ Link Here 
107
	'prohibitedObjectClasses': univention.admin.property(
107
	'prohibitedObjectClasses': univention.admin.property(
108
			short_description=_('Excluded object class'),
108
			short_description=_('Excluded object class'),
109
			long_description='',
109
			long_description='',
110
			syntax=univention.admin.syntax.string,
110
			syntax=univention.admin.syntax.ldapObjectClass,
111
			multivalue=1,
111
			multivalue=1,
112
			options=[],
112
			options=[],
113
			required=0,
113
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/thinclient.py (-2 / +2 lines)
 Lines 130-136   property_descriptions={ Link Here 
130
	'requiredObjectClasses': univention.admin.property(
130
	'requiredObjectClasses': univention.admin.property(
131
			short_description=_('Required object class'),
131
			short_description=_('Required object class'),
132
			long_description='',
132
			long_description='',
133
			syntax=univention.admin.syntax.string,
133
			syntax=univention.admin.syntax.ldapObjectClass,
134
			multivalue=1,
134
			multivalue=1,
135
			options=[],
135
			options=[],
136
			required=0,
136
			required=0,
 Lines 140-146   property_descriptions={ Link Here 
140
	'prohibitedObjectClasses': univention.admin.property(
140
	'prohibitedObjectClasses': univention.admin.property(
141
			short_description=_('Excluded object class'),
141
			short_description=_('Excluded object class'),
142
			long_description='',
142
			long_description='',
143
			syntax=univention.admin.syntax.string,
143
			syntax=univention.admin.syntax.ldapObjectClass,
144
			multivalue=1,
144
			multivalue=1,
145
			options=[],
145
			options=[],
146
			required=0,
146
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/xfree.py (-2 / +2 lines)
 Lines 239-245   property_descriptions={ Link Here 
239
	'requiredObjectClasses': univention.admin.property(
239
	'requiredObjectClasses': univention.admin.property(
240
			short_description=_('Required object class'),
240
			short_description=_('Required object class'),
241
			long_description='',
241
			long_description='',
242
			syntax=univention.admin.syntax.string,
242
			syntax=univention.admin.syntax.ldapObjectClass,
243
			multivalue=1,
243
			multivalue=1,
244
			options=[],
244
			options=[],
245
			required=0,
245
			required=0,
 Lines 249-255   property_descriptions={ Link Here 
249
	'prohibitedObjectClasses': univention.admin.property(
249
	'prohibitedObjectClasses': univention.admin.property(
250
			short_description=_('Excluded object class'),
250
			short_description=_('Excluded object class'),
251
			long_description='',
251
			long_description='',
252
			syntax=univention.admin.syntax.string,
252
			syntax=univention.admin.syntax.ldapObjectClass,
253
			multivalue=1,
253
			multivalue=1,
254
			options=[],
254
			options=[],
255
			required=0,
255
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/admin_container.py (-4 / +4 lines)
 Lines 52-58   module='policies/admin_container' Link Here 
52
operations=['add','edit','remove','search']
52
operations=['add','edit','remove','search']
53
53
54
policy_oc='univentionPolicyAdminContainerSettings'
54
policy_oc='univentionPolicyAdminContainerSettings'
55
policy_apply_to=[] 
55
policy_apply_to=[]
56
policy_position_dn_prefix="cn=container,cn=admin"
56
policy_position_dn_prefix="cn=container,cn=admin"
57
57
58
usewizard=1
58
usewizard=1
 Lines 87-93   property_descriptions={ Link Here 
87
	'requiredObjectClasses': univention.admin.property(
87
	'requiredObjectClasses': univention.admin.property(
88
			short_description=_('Required object class'),
88
			short_description=_('Required object class'),
89
			long_description='',
89
			long_description='',
90
			syntax=univention.admin.syntax.string,
90
			syntax=univention.admin.syntax.ldapObjectClass,
91
			multivalue=1,
91
			multivalue=1,
92
			options=[],
92
			options=[],
93
			required=0,
93
			required=0,
 Lines 97-103   property_descriptions={ Link Here 
97
	'prohibitedObjectClasses': univention.admin.property(
97
	'prohibitedObjectClasses': univention.admin.property(
98
			short_description=_('Excluded object class'),
98
			short_description=_('Excluded object class'),
99
			long_description='',
99
			long_description='',
100
			syntax=univention.admin.syntax.string,
100
			syntax=univention.admin.syntax.ldapObjectClass,
101
			multivalue=1,
101
			multivalue=1,
102
			options=[],
102
			options=[],
103
			required=0,
103
			required=0,
 Lines 176-182   class object(univention.admin.handlers.simplePolicy): Link Here 
176
176
177
	def _ldap_addlist(self):
177
	def _ldap_addlist(self):
178
		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyAdminContainerSettings']) ]
178
		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyAdminContainerSettings']) ]
179
	
179
180
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
180
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
181
181
182
	filter=univention.admin.filter.conjunction('&', [
182
	filter=univention.admin.filter.conjunction('&', [
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/autostart.py (-3 / +3 lines)
 Lines 85-91   property_descriptions={ Link Here 
85
	'requiredObjectClasses': univention.admin.property(
85
	'requiredObjectClasses': univention.admin.property(
86
			short_description=_('Required object class'),
86
			short_description=_('Required object class'),
87
			long_description='',
87
			long_description='',
88
			syntax=univention.admin.syntax.string,
88
			syntax=univention.admin.syntax.ldapObjectClass,
89
			multivalue=1,
89
			multivalue=1,
90
			options=[],
90
			options=[],
91
			required=0,
91
			required=0,
 Lines 95-101   property_descriptions={ Link Here 
95
	'prohibitedObjectClasses': univention.admin.property(
95
	'prohibitedObjectClasses': univention.admin.property(
96
			short_description=_('Excluded object class'),
96
			short_description=_('Excluded object class'),
97
			long_description='',
97
			long_description='',
98
			syntax=univention.admin.syntax.string,
98
			syntax=univention.admin.syntax.ldapObjectClass,
99
			multivalue=1,
99
			multivalue=1,
100
			options=[],
100
			options=[],
101
			required=0,
101
			required=0,
 Lines 174-180   class object(univention.admin.handlers.simplePolicy): Link Here 
174
174
175
	def _ldap_addlist(self):
175
	def _ldap_addlist(self):
176
		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyAutoStart']) ]
176
		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyAutoStart']) ]
177
	
177
178
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
178
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
179
179
180
	filter=univention.admin.filter.conjunction('&', [
180
	filter=univention.admin.filter.conjunction('&', [
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/desktop.py (-3 / +3 lines)
 Lines 116-122   property_descriptions={ Link Here 
116
	'requiredObjectClasses': univention.admin.property(
116
	'requiredObjectClasses': univention.admin.property(
117
			short_description=_('Required object class'),
117
			short_description=_('Required object class'),
118
			long_description='',
118
			long_description='',
119
			syntax=univention.admin.syntax.string,
119
			syntax=univention.admin.syntax.ldapObjectClass,
120
			multivalue=1,
120
			multivalue=1,
121
			options=[],
121
			options=[],
122
			required=0,
122
			required=0,
 Lines 126-132   property_descriptions={ Link Here 
126
	'prohibitedObjectClasses': univention.admin.property(
126
	'prohibitedObjectClasses': univention.admin.property(
127
			short_description=_('Excluded object class'),
127
			short_description=_('Excluded object class'),
128
			long_description='',
128
			long_description='',
129
			syntax=univention.admin.syntax.string,
129
			syntax=univention.admin.syntax.ldapObjectClass,
130
			multivalue=1,
130
			multivalue=1,
131
			options=[],
131
			options=[],
132
			required=0,
132
			required=0,
 Lines 210-216   class object(univention.admin.handlers.simplePolicy): Link Here 
210
210
211
	def _ldap_addlist(self):
211
	def _ldap_addlist(self):
212
		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyDesktop']) ]
212
		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyDesktop']) ]
213
	
213
214
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
214
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
215
215
216
	filter=univention.admin.filter.conjunction('&', [
216
	filter=univention.admin.filter.conjunction('&', [
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_boot.py (-4 / +4 lines)
 Lines 96-102   server from which the initial boot file is retrieved.'), Link Here 
96
	'requiredObjectClasses': univention.admin.property(
96
	'requiredObjectClasses': univention.admin.property(
97
			short_description=_('Required object class'),
97
			short_description=_('Required object class'),
98
			long_description='',
98
			long_description='',
99
			syntax=univention.admin.syntax.string,
99
			syntax=univention.admin.syntax.ldapObjectClass,
100
			multivalue=1,
100
			multivalue=1,
101
			options=[],
101
			options=[],
102
			required=0,
102
			required=0,
 Lines 106-112   server from which the initial boot file is retrieved.'), Link Here 
106
	'prohibitedObjectClasses': univention.admin.property(
106
	'prohibitedObjectClasses': univention.admin.property(
107
			short_description=_('Excluded object class'),
107
			short_description=_('Excluded object class'),
108
			long_description='',
108
			long_description='',
109
			syntax=univention.admin.syntax.string,
109
			syntax=univention.admin.syntax.ldapObjectClass,
110
			multivalue=1,
110
			multivalue=1,
111
			options=[],
111
			options=[],
112
			required=0,
112
			required=0,
 Lines 189-195   class object(univention.admin.handlers.simplePolicy): Link Here 
189
		return [
189
		return [
190
			('objectClass', ['top', 'univentionPolicy', 'univentionPolicyDhcpBoot'])
190
			('objectClass', ['top', 'univentionPolicy', 'univentionPolicyDhcpBoot'])
191
		]
191
		]
192
	
192
193
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
193
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
194
194
195
	filter=univention.admin.filter.conjunction('&', [
195
	filter=univention.admin.filter.conjunction('&', [
 Lines 210-214   def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, Link Here 
210
	return res
210
	return res
211
211
212
def identify(dn, attr, canonical=0):
212
def identify(dn, attr, canonical=0):
213
	
213
214
	return 'univentionPolicyDhcpBoot' in attr.get('objectClass', [])
214
	return 'univentionPolicyDhcpBoot' in attr.get('objectClass', [])
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_dns.py (-4 / +4 lines)
 Lines 96-102   property_descriptions={ Link Here 
96
	'requiredObjectClasses': univention.admin.property(
96
	'requiredObjectClasses': univention.admin.property(
97
			short_description=_('Required object class'),
97
			short_description=_('Required object class'),
98
			long_description='',
98
			long_description='',
99
			syntax=univention.admin.syntax.string,
99
			syntax=univention.admin.syntax.ldapObjectClass,
100
			multivalue=1,
100
			multivalue=1,
101
			options=[],
101
			options=[],
102
			required=0,
102
			required=0,
 Lines 106-112   property_descriptions={ Link Here 
106
	'prohibitedObjectClasses': univention.admin.property(
106
	'prohibitedObjectClasses': univention.admin.property(
107
			short_description=_('Excluded object class'),
107
			short_description=_('Excluded object class'),
108
			long_description='',
108
			long_description='',
109
			syntax=univention.admin.syntax.string,
109
			syntax=univention.admin.syntax.ldapObjectClass,
110
			multivalue=1,
110
			multivalue=1,
111
			options=[],
111
			options=[],
112
			required=0,
112
			required=0,
 Lines 189-195   class object(univention.admin.handlers.simplePolicy): Link Here 
189
		return [
189
		return [
190
			('objectClass', ['top', 'univentionPolicy', 'univentionPolicyDhcpDns'])
190
			('objectClass', ['top', 'univentionPolicy', 'univentionPolicyDhcpDns'])
191
		]
191
		]
192
	
192
193
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
193
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
194
194
195
	filter=univention.admin.filter.conjunction('&', [
195
	filter=univention.admin.filter.conjunction('&', [
 Lines 210-214   def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, Link Here 
210
	return res
210
	return res
211
211
212
def identify(dn, attr, canonical=0):
212
def identify(dn, attr, canonical=0):
213
	
213
214
	return 'univentionPolicyDhcpDns' in attr.get('objectClass', [])
214
	return 'univentionPolicyDhcpDns' in attr.get('objectClass', [])
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_dnsupdate.py (-2 / +2 lines)
 Lines 162-168   property_descriptions={ Link Here 
162
	'requiredObjectClasses': univention.admin.property(
162
	'requiredObjectClasses': univention.admin.property(
163
			short_description=_('Required object class'),
163
			short_description=_('Required object class'),
164
			long_description='',
164
			long_description='',
165
			syntax=univention.admin.syntax.string,
165
			syntax=univention.admin.syntax.ldapObjectClass,
166
			multivalue=1,
166
			multivalue=1,
167
			options=[],
167
			options=[],
168
			required=0,
168
			required=0,
 Lines 172-178   property_descriptions={ Link Here 
172
	'prohibitedObjectClasses': univention.admin.property(
172
	'prohibitedObjectClasses': univention.admin.property(
173
			short_description=_('Excluded object class'),
173
			short_description=_('Excluded object class'),
174
			long_description='',
174
			long_description='',
175
			syntax=univention.admin.syntax.string,
175
			syntax=univention.admin.syntax.ldapObjectClass,
176
			multivalue=1,
176
			multivalue=1,
177
			options=[],
177
			options=[],
178
			required=0,
178
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_leasetime.py (-2 / +2 lines)
 Lines 106-112   property_descriptions={ Link Here 
106
	'requiredObjectClasses': univention.admin.property(
106
	'requiredObjectClasses': univention.admin.property(
107
			short_description=_('Required object class'),
107
			short_description=_('Required object class'),
108
			long_description='',
108
			long_description='',
109
			syntax=univention.admin.syntax.string,
109
			syntax=univention.admin.syntax.ldapObjectClass,
110
			multivalue=1,
110
			multivalue=1,
111
			options=[],
111
			options=[],
112
			required=0,
112
			required=0,
 Lines 116-122   property_descriptions={ Link Here 
116
	'prohibitedObjectClasses': univention.admin.property(
116
	'prohibitedObjectClasses': univention.admin.property(
117
			short_description=_('Excluded object class'),
117
			short_description=_('Excluded object class'),
118
			long_description='',
118
			long_description='',
119
			syntax=univention.admin.syntax.string,
119
			syntax=univention.admin.syntax.ldapObjectClass,
120
			multivalue=1,
120
			multivalue=1,
121
			options=[],
121
			options=[],
122
			required=0,
122
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_netbios.py (-2 / +2 lines)
 Lines 106-112   property_descriptions={ Link Here 
106
	'requiredObjectClasses': univention.admin.property(
106
	'requiredObjectClasses': univention.admin.property(
107
			short_description=_('Required object class'),
107
			short_description=_('Required object class'),
108
			long_description='',
108
			long_description='',
109
			syntax=univention.admin.syntax.string,
109
			syntax=univention.admin.syntax.ldapObjectClass,
110
			multivalue=1,
110
			multivalue=1,
111
			options=[],
111
			options=[],
112
			required=0,
112
			required=0,
 Lines 116-122   property_descriptions={ Link Here 
116
	'prohibitedObjectClasses': univention.admin.property(
116
	'prohibitedObjectClasses': univention.admin.property(
117
			short_description=_('Excluded object class'),
117
			short_description=_('Excluded object class'),
118
			long_description='',
118
			long_description='',
119
			syntax=univention.admin.syntax.string,
119
			syntax=univention.admin.syntax.ldapObjectClass,
120
			multivalue=1,
120
			multivalue=1,
121
			options=[],
121
			options=[],
122
			required=0,
122
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_routing.py (-4 / +4 lines)
 Lines 84-90   property_descriptions={ Link Here 
84
	'requiredObjectClasses': univention.admin.property(
84
	'requiredObjectClasses': univention.admin.property(
85
			short_description=_('Required object class'),
85
			short_description=_('Required object class'),
86
			long_description='',
86
			long_description='',
87
			syntax=univention.admin.syntax.string,
87
			syntax=univention.admin.syntax.ldapObjectClass,
88
			multivalue=1,
88
			multivalue=1,
89
			options=[],
89
			options=[],
90
			required=0,
90
			required=0,
 Lines 94-100   property_descriptions={ Link Here 
94
	'prohibitedObjectClasses': univention.admin.property(
94
	'prohibitedObjectClasses': univention.admin.property(
95
			short_description=_('Excluded object class'),
95
			short_description=_('Excluded object class'),
96
			long_description='',
96
			long_description='',
97
			syntax=univention.admin.syntax.string,
97
			syntax=univention.admin.syntax.ldapObjectClass,
98
			multivalue=1,
98
			multivalue=1,
99
			options=[],
99
			options=[],
100
			required=0,
100
			required=0,
 Lines 176-182   class object(univention.admin.handlers.simplePolicy): Link Here 
176
		return [
176
		return [
177
			('objectClass', ['top', 'univentionPolicy', 'univentionPolicyDhcpRouting'])
177
			('objectClass', ['top', 'univentionPolicy', 'univentionPolicyDhcpRouting'])
178
		]
178
		]
179
	
179
180
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
180
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
181
181
182
	filter=univention.admin.filter.conjunction('&', [
182
	filter=univention.admin.filter.conjunction('&', [
 Lines 197-201   def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, Link Here 
197
	return res
197
	return res
198
198
199
def identify(dn, attr, canonical=0):
199
def identify(dn, attr, canonical=0):
200
	
200
201
	return 'univentionPolicyDhcpRouting' in attr.get('objectClass', [])
201
	return 'univentionPolicyDhcpRouting' in attr.get('objectClass', [])
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_scope.py (-2 / +2 lines)
 Lines 128-134   property_descriptions={ Link Here 
128
	'requiredObjectClasses': univention.admin.property(
128
	'requiredObjectClasses': univention.admin.property(
129
			short_description=_('Required object class'),
129
			short_description=_('Required object class'),
130
			long_description='',
130
			long_description='',
131
			syntax=univention.admin.syntax.string,
131
			syntax=univention.admin.syntax.ldapObjectClass,
132
			multivalue=1,
132
			multivalue=1,
133
			options=[],
133
			options=[],
134
			required=0,
134
			required=0,
 Lines 138-144   property_descriptions={ Link Here 
138
	'prohibitedObjectClasses': univention.admin.property(
138
	'prohibitedObjectClasses': univention.admin.property(
139
			short_description=_('Excluded object class'),
139
			short_description=_('Excluded object class'),
140
			long_description='',
140
			long_description='',
141
			syntax=univention.admin.syntax.string,
141
			syntax=univention.admin.syntax.ldapObjectClass,
142
			multivalue=1,
142
			multivalue=1,
143
			options=[],
143
			options=[],
144
			required=0,
144
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_statements.py (-2 / +2 lines)
 Lines 139-145   property_descriptions={ Link Here 
139
	'requiredObjectClasses': univention.admin.property(
139
	'requiredObjectClasses': univention.admin.property(
140
			short_description=_('Required object class'),
140
			short_description=_('Required object class'),
141
			long_description='',
141
			long_description='',
142
			syntax=univention.admin.syntax.string,
142
			syntax=univention.admin.syntax.ldapObjectClass,
143
			multivalue=1,
143
			multivalue=1,
144
			options=[],
144
			options=[],
145
			required=0,
145
			required=0,
 Lines 149-155   property_descriptions={ Link Here 
149
	'prohibitedObjectClasses': univention.admin.property(
149
	'prohibitedObjectClasses': univention.admin.property(
150
			short_description=_('Excluded object class'),
150
			short_description=_('Excluded object class'),
151
			long_description='',
151
			long_description='',
152
			syntax=univention.admin.syntax.string,
152
			syntax=univention.admin.syntax.ldapObjectClass,
153
			multivalue=1,
153
			multivalue=1,
154
			options=[],
154
			options=[],
155
			required=0,
155
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/ldapserver.py (-3 / +3 lines)
 Lines 85-91   property_descriptions={ Link Here 
85
	'requiredObjectClasses': univention.admin.property(
85
	'requiredObjectClasses': univention.admin.property(
86
			short_description=_('Required object class'),
86
			short_description=_('Required object class'),
87
			long_description='',
87
			long_description='',
88
			syntax=univention.admin.syntax.string,
88
			syntax=univention.admin.syntax.ldapObjectClass,
89
			multivalue=1,
89
			multivalue=1,
90
			options=[],
90
			options=[],
91
			required=0,
91
			required=0,
 Lines 95-101   property_descriptions={ Link Here 
95
	'prohibitedObjectClasses': univention.admin.property(
95
	'prohibitedObjectClasses': univention.admin.property(
96
			short_description=_('Excluded object class'),
96
			short_description=_('Excluded object class'),
97
			long_description='',
97
			long_description='',
98
			syntax=univention.admin.syntax.string,
98
			syntax=univention.admin.syntax.ldapObjectClass,
99
			multivalue=1,
99
			multivalue=1,
100
			options=[],
100
			options=[],
101
			required=0,
101
			required=0,
 Lines 174-180   class object(univention.admin.handlers.simplePolicy): Link Here 
174
174
175
	def _ldap_addlist(self):
175
	def _ldap_addlist(self):
176
		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyLDAPServer']) ]
176
		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionPolicyLDAPServer']) ]
177
	
177
178
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
178
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
179
179
180
	filter=univention.admin.filter.conjunction('&', [
180
	filter=univention.admin.filter.conjunction('&', [
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/mailquota.py (-3 / +3 lines)
 Lines 85-91   property_descriptions={ Link Here 
85
	'requiredObjectClasses': univention.admin.property(
85
	'requiredObjectClasses': univention.admin.property(
86
			short_description=_('Required object class'),
86
			short_description=_('Required object class'),
87
			long_description='',
87
			long_description='',
88
			syntax=univention.admin.syntax.string,
88
			syntax=univention.admin.syntax.ldapObjectClass,
89
			multivalue=1,
89
			multivalue=1,
90
			options=[],
90
			options=[],
91
			required=0,
91
			required=0,
 Lines 95-101   property_descriptions={ Link Here 
95
	'prohibitedObjectClasses': univention.admin.property(
95
	'prohibitedObjectClasses': univention.admin.property(
96
			short_description=_('Excluded object class'),
96
			short_description=_('Excluded object class'),
97
			long_description='',
97
			long_description='',
98
			syntax=univention.admin.syntax.string,
98
			syntax=univention.admin.syntax.ldapObjectClass,
99
			multivalue=1,
99
			multivalue=1,
100
			options=[],
100
			options=[],
101
			required=0,
101
			required=0,
 Lines 174-180   class object(univention.admin.handlers.simplePolicy): Link Here 
174
174
175
	def _ldap_addlist(self):
175
	def _ldap_addlist(self):
176
		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionMailQuota']) ]
176
		return [ ('objectClass', ['top', 'univentionPolicy', 'univentionMailQuota']) ]
177
	
177
178
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
178
def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
179
179
180
	filter=univention.admin.filter.conjunction('&', [
180
	filter=univention.admin.filter.conjunction('&', [
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/maintenance.py (-2 / +2 lines)
 Lines 166-172   property_descriptions={ Link Here 
166
	'requiredObjectClasses': univention.admin.property(
166
	'requiredObjectClasses': univention.admin.property(
167
			short_description=_('Required object class'),
167
			short_description=_('Required object class'),
168
			long_description='',
168
			long_description='',
169
			syntax=univention.admin.syntax.string,
169
			syntax=univention.admin.syntax.ldapObjectClass,
170
			multivalue=1,
170
			multivalue=1,
171
			options=[],
171
			options=[],
172
			required=0,
172
			required=0,
 Lines 176-182   property_descriptions={ Link Here 
176
	'prohibitedObjectClasses': univention.admin.property(
176
	'prohibitedObjectClasses': univention.admin.property(
177
			short_description=_('Excluded object class'),
177
			short_description=_('Excluded object class'),
178
			long_description='',
178
			long_description='',
179
			syntax=univention.admin.syntax.string,
179
			syntax=univention.admin.syntax.ldapObjectClass,
180
			multivalue=1,
180
			multivalue=1,
181
			options=[],
181
			options=[],
182
			required=0,
182
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/masterpackages.py (-2 / +2 lines)
 Lines 96-102   property_descriptions={ Link Here 
96
	'requiredObjectClasses': univention.admin.property(
96
	'requiredObjectClasses': univention.admin.property(
97
			short_description=_('Required object class'),
97
			short_description=_('Required object class'),
98
			long_description='',
98
			long_description='',
99
			syntax=univention.admin.syntax.string,
99
			syntax=univention.admin.syntax.ldapObjectClass,
100
			multivalue=1,
100
			multivalue=1,
101
			options=[],
101
			options=[],
102
			required=0,
102
			required=0,
 Lines 106-112   property_descriptions={ Link Here 
106
	'prohibitedObjectClasses': univention.admin.property(
106
	'prohibitedObjectClasses': univention.admin.property(
107
			short_description=_('Excluded object class'),
107
			short_description=_('Excluded object class'),
108
			long_description='',
108
			long_description='',
109
			syntax=univention.admin.syntax.string,
109
			syntax=univention.admin.syntax.ldapObjectClass,
110
			multivalue=1,
110
			multivalue=1,
111
			options=[],
111
			options=[],
112
			required=0,
112
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/memberpackages.py (-2 / +2 lines)
 Lines 96-102   property_descriptions={ Link Here 
96
	'requiredObjectClasses': univention.admin.property(
96
	'requiredObjectClasses': univention.admin.property(
97
			short_description=_('Required object class'),
97
			short_description=_('Required object class'),
98
			long_description='',
98
			long_description='',
99
			syntax=univention.admin.syntax.string,
99
			syntax=univention.admin.syntax.ldapObjectClass,
100
			multivalue=1,
100
			multivalue=1,
101
			options=[],
101
			options=[],
102
			required=0,
102
			required=0,
 Lines 106-112   property_descriptions={ Link Here 
106
	'prohibitedObjectClasses': univention.admin.property(
106
	'prohibitedObjectClasses': univention.admin.property(
107
			short_description=_('Excluded object class'),
107
			short_description=_('Excluded object class'),
108
			long_description='',
108
			long_description='',
109
			syntax=univention.admin.syntax.string,
109
			syntax=univention.admin.syntax.ldapObjectClass,
110
			multivalue=1,
110
			multivalue=1,
111
			options=[],
111
			options=[],
112
			required=0,
112
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/nfsmounts.py (-2 / +2 lines)
 Lines 85-91   property_descriptions={ Link Here 
85
	'requiredObjectClasses': univention.admin.property(
85
	'requiredObjectClasses': univention.admin.property(
86
			short_description=_('Required object class'),
86
			short_description=_('Required object class'),
87
			long_description='',
87
			long_description='',
88
			syntax=univention.admin.syntax.string,
88
			syntax=univention.admin.syntax.ldapObjectClass,
89
			multivalue=1,
89
			multivalue=1,
90
			options=[],
90
			options=[],
91
			required=0,
91
			required=0,
 Lines 95-101   property_descriptions={ Link Here 
95
	'prohibitedObjectClasses': univention.admin.property(
95
	'prohibitedObjectClasses': univention.admin.property(
96
			short_description=_('Excluded object class'),
96
			short_description=_('Excluded object class'),
97
			long_description='',
97
			long_description='',
98
			syntax=univention.admin.syntax.string,
98
			syntax=univention.admin.syntax.ldapObjectClass,
99
			multivalue=1,
99
			multivalue=1,
100
			options=[],
100
			options=[],
101
			required=0,
101
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/print_quota.py (-2 / +2 lines)
 Lines 109-115   property_descriptions={ Link Here 
109
	'requiredObjectClasses': univention.admin.property(
109
	'requiredObjectClasses': univention.admin.property(
110
			short_description=_('Required object class'),
110
			short_description=_('Required object class'),
111
			long_description='',
111
			long_description='',
112
			syntax=univention.admin.syntax.string,
112
			syntax=univention.admin.syntax.ldapObjectClass,
113
			multivalue=1,
113
			multivalue=1,
114
			options=[],
114
			options=[],
115
			required=0,
115
			required=0,
 Lines 119-125   property_descriptions={ Link Here 
119
	'prohibitedObjectClasses': univention.admin.property(
119
	'prohibitedObjectClasses': univention.admin.property(
120
			short_description=_('Excluded object class'),
120
			short_description=_('Excluded object class'),
121
			long_description='',
121
			long_description='',
122
			syntax=univention.admin.syntax.string,
122
			syntax=univention.admin.syntax.ldapObjectClass,
123
			multivalue=1,
123
			multivalue=1,
124
			options=[],
124
			options=[],
125
			required=0,
125
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/printserver.py (-2 / +2 lines)
 Lines 85-91   property_descriptions={ Link Here 
85
	'requiredObjectClasses': univention.admin.property(
85
	'requiredObjectClasses': univention.admin.property(
86
			short_description=_('Required object class'),
86
			short_description=_('Required object class'),
87
			long_description='',
87
			long_description='',
88
			syntax=univention.admin.syntax.string,
88
			syntax=univention.admin.syntax.ldapObjectClass,
89
			multivalue=1,
89
			multivalue=1,
90
			options=[],
90
			options=[],
91
			required=0,
91
			required=0,
 Lines 95-101   property_descriptions={ Link Here 
95
	'prohibitedObjectClasses': univention.admin.property(
95
	'prohibitedObjectClasses': univention.admin.property(
96
			short_description=_('Excluded object class'),
96
			short_description=_('Excluded object class'),
97
			long_description='',
97
			long_description='',
98
			syntax=univention.admin.syntax.string,
98
			syntax=univention.admin.syntax.ldapObjectClass,
99
			multivalue=1,
99
			multivalue=1,
100
			options=[],
100
			options=[],
101
			required=0,
101
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/pwhistory.py (-2 / +2 lines)
 Lines 117-123   property_descriptions={ Link Here 
117
	'requiredObjectClasses': univention.admin.property(
117
	'requiredObjectClasses': univention.admin.property(
118
			short_description=_('Required object class'),
118
			short_description=_('Required object class'),
119
			long_description='',
119
			long_description='',
120
			syntax=univention.admin.syntax.string,
120
			syntax=univention.admin.syntax.ldapObjectClass,
121
			multivalue=1,
121
			multivalue=1,
122
			options=[],
122
			options=[],
123
			required=0,
123
			required=0,
 Lines 127-133   property_descriptions={ Link Here 
127
	'prohibitedObjectClasses': univention.admin.property(
127
	'prohibitedObjectClasses': univention.admin.property(
128
			short_description=_('Excluded object class'),
128
			short_description=_('Excluded object class'),
129
			long_description='',
129
			long_description='',
130
			syntax=univention.admin.syntax.string,
130
			syntax=univention.admin.syntax.ldapObjectClass,
131
			multivalue=1,
131
			multivalue=1,
132
			options=[],
132
			options=[],
133
			required=0,
133
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/registry.py (-2 / +2 lines)
 Lines 84-90   property_descriptions={ Link Here 
84
	'requiredObjectClasses': univention.admin.property(
84
	'requiredObjectClasses': univention.admin.property(
85
			short_description=_('Required object class'),
85
			short_description=_('Required object class'),
86
			long_description='',
86
			long_description='',
87
			syntax=univention.admin.syntax.string,
87
			syntax=univention.admin.syntax.ldapObjectClass,
88
			multivalue=1,
88
			multivalue=1,
89
			options=[],
89
			options=[],
90
			required=0,
90
			required=0,
 Lines 94-100   property_descriptions={ Link Here 
94
	'prohibitedObjectClasses': univention.admin.property(
94
	'prohibitedObjectClasses': univention.admin.property(
95
			short_description=_('Excluded object class'),
95
			short_description=_('Excluded object class'),
96
			long_description='',
96
			long_description='',
97
			syntax=univention.admin.syntax.string,
97
			syntax=univention.admin.syntax.ldapObjectClass,
98
			multivalue=1,
98
			multivalue=1,
99
			options=[],
99
			options=[],
100
			required=0,
100
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/release.py (-2 / +2 lines)
 Lines 95-101   property_descriptions={ Link Here 
95
	'requiredObjectClasses': univention.admin.property(
95
	'requiredObjectClasses': univention.admin.property(
96
			short_description=_('Required object class'),
96
			short_description=_('Required object class'),
97
			long_description='',
97
			long_description='',
98
			syntax=univention.admin.syntax.string,
98
			syntax=univention.admin.syntax.ldapObjectClass,
99
			multivalue=1,
99
			multivalue=1,
100
			options=[],
100
			options=[],
101
			required=0,
101
			required=0,
 Lines 105-111   property_descriptions={ Link Here 
105
	'prohibitedObjectClasses': univention.admin.property(
105
	'prohibitedObjectClasses': univention.admin.property(
106
			short_description=_('Excluded object class'),
106
			short_description=_('Excluded object class'),
107
			long_description='',
107
			long_description='',
108
			syntax=univention.admin.syntax.string,
108
			syntax=univention.admin.syntax.ldapObjectClass,
109
			multivalue=1,
109
			multivalue=1,
110
			options=[],
110
			options=[],
111
			required=0,
111
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/repositoryserver.py (-2 / +2 lines)
 Lines 86-92   property_descriptions={ Link Here 
86
	'requiredObjectClasses': univention.admin.property(
86
	'requiredObjectClasses': univention.admin.property(
87
			short_description=_('Required object class'),
87
			short_description=_('Required object class'),
88
			long_description='',
88
			long_description='',
89
			syntax=univention.admin.syntax.string,
89
			syntax=univention.admin.syntax.ldapObjectClass,
90
			multivalue=1,
90
			multivalue=1,
91
			options=[],
91
			options=[],
92
			required=0,
92
			required=0,
 Lines 96-102   property_descriptions={ Link Here 
96
	'prohibitedObjectClasses': univention.admin.property(
96
	'prohibitedObjectClasses': univention.admin.property(
97
			short_description=_('Excluded object class'),
97
			short_description=_('Excluded object class'),
98
			long_description='',
98
			long_description='',
99
			syntax=univention.admin.syntax.string,
99
			syntax=univention.admin.syntax.ldapObjectClass,
100
			multivalue=1,
100
			multivalue=1,
101
			options=[],
101
			options=[],
102
			required=0,
102
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/repositorysync.py (-2 / +2 lines)
 Lines 126-132   property_descriptions={ Link Here 
126
	'requiredObjectClasses': univention.admin.property(
126
	'requiredObjectClasses': univention.admin.property(
127
			short_description=_('Required object class'),
127
			short_description=_('Required object class'),
128
			long_description='',
128
			long_description='',
129
			syntax=univention.admin.syntax.string,
129
			syntax=univention.admin.syntax.ldapObjectClass,
130
			multivalue=1,
130
			multivalue=1,
131
			options=[],
131
			options=[],
132
			required=0,
132
			required=0,
 Lines 136-142   property_descriptions={ Link Here 
136
	'prohibitedObjectClasses': univention.admin.property(
136
	'prohibitedObjectClasses': univention.admin.property(
137
			short_description=_('Excluded object class'),
137
			short_description=_('Excluded object class'),
138
			long_description='',
138
			long_description='',
139
			syntax=univention.admin.syntax.string,
139
			syntax=univention.admin.syntax.ldapObjectClass,
140
			multivalue=1,
140
			multivalue=1,
141
			options=[],
141
			options=[],
142
			required=0,
142
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/share_userquota.py (-2 / +2 lines)
 Lines 130-136   property_descriptions={ Link Here 
130
	'requiredObjectClasses': univention.admin.property(
130
	'requiredObjectClasses': univention.admin.property(
131
			short_description=_('Required object class'),
131
			short_description=_('Required object class'),
132
			long_description='',
132
			long_description='',
133
			syntax=univention.admin.syntax.string,
133
			syntax=univention.admin.syntax.ldapObjectClass,
134
			multivalue=1,
134
			multivalue=1,
135
			options=[],
135
			options=[],
136
			required=0,
136
			required=0,
 Lines 140-146   property_descriptions={ Link Here 
140
	'prohibitedObjectClasses': univention.admin.property(
140
	'prohibitedObjectClasses': univention.admin.property(
141
			short_description=_('Excluded object class'),
141
			short_description=_('Excluded object class'),
142
			long_description='',
142
			long_description='',
143
			syntax=univention.admin.syntax.string,
143
			syntax=univention.admin.syntax.ldapObjectClass,
144
			multivalue=1,
144
			multivalue=1,
145
			options=[],
145
			options=[],
146
			required=0,
146
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/slavepackages.py (-2 / +2 lines)
 Lines 96-102   property_descriptions={ Link Here 
96
	'requiredObjectClasses': univention.admin.property(
96
	'requiredObjectClasses': univention.admin.property(
97
			short_description=_('Required object class'),
97
			short_description=_('Required object class'),
98
			long_description='',
98
			long_description='',
99
			syntax=univention.admin.syntax.string,
99
			syntax=univention.admin.syntax.ldapObjectClass,
100
			multivalue=1,
100
			multivalue=1,
101
			options=[],
101
			options=[],
102
			required=0,
102
			required=0,
 Lines 106-112   property_descriptions={ Link Here 
106
	'prohibitedObjectClasses': univention.admin.property(
106
	'prohibitedObjectClasses': univention.admin.property(
107
			short_description=_('Excluded object class'),
107
			short_description=_('Excluded object class'),
108
			long_description='',
108
			long_description='',
109
			syntax=univention.admin.syntax.string,
109
			syntax=univention.admin.syntax.ldapObjectClass,
110
			multivalue=1,
110
			multivalue=1,
111
			options=[],
111
			options=[],
112
			required=0,
112
			required=0,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/extended_attribute.py (-2 / +2 lines)
 Lines 257-263   property_descriptions={ Link Here 
257
	'ldapMapping': univention.admin.property(
257
	'ldapMapping': univention.admin.property(
258
			short_description=_('LDAP attribute'),
258
			short_description=_('LDAP attribute'),
259
			long_description=_('Univention Corporate Server provides its own LDAP scheme for customer extensions. The LDAP object class univentionFreeAttributes can be used for extended attributes without restrictions. It offers 20 freely usable attributes (univentionFreeAttribute1 to univentionFreeAttribute20) and can be used in connection with any LDAP object (e.g., a user object)'),
259
			long_description=_('Univention Corporate Server provides its own LDAP scheme for customer extensions. The LDAP object class univentionFreeAttributes can be used for extended attributes without restrictions. It offers 20 freely usable attributes (univentionFreeAttribute1 to univentionFreeAttribute20) and can be used in connection with any LDAP object (e.g., a user object)'),
260
			syntax=univention.admin.syntax.string,
260
			syntax=univention.admin.syntax.ldapAttribute,
261
			multivalue=0,
261
			multivalue=0,
262
			options=[],
262
			options=[],
263
			required=1,
263
			required=1,
 Lines 298-304   property_descriptions={ Link Here 
298
	'objectClass': univention.admin.property(
298
	'objectClass': univention.admin.property(
299
			short_description=_('LDAP object class'),
299
			short_description=_('LDAP object class'),
300
			long_description=_('Univention Corporate Server provides its own LDAP scheme for customer extensions. The LDAP object class univentionFreeAttributes can be used for extended attributes without restrictions. It offers 20 freely usable attributes (univentionFreeAttribute1 to univentionFreeAttribute20) and can be used in connection with any LDAP object (e.g., a user object)'),
300
			long_description=_('Univention Corporate Server provides its own LDAP scheme for customer extensions. The LDAP object class univentionFreeAttributes can be used for extended attributes without restrictions. It offers 20 freely usable attributes (univentionFreeAttribute1 to univentionFreeAttribute20) and can be used in connection with any LDAP object (e.g., a user object)'),
301
			syntax=univention.admin.syntax.string,
301
			syntax=univention.admin.syntax.ldapObjectClass,
302
			multivalue=0,
302
			multivalue=0,
303
			options=[],
303
			options=[],
304
			required=1,
304
			required=1,
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-directory-manager-modules/modules/univention/admin/syntax.py (-22 / +49 lines)
 Lines 1467-1481   class ldapDnOrNone(simple): Link Here 
1467
			return text
1467
			return text
1468
		raise univention.admin.uexceptions.valueError,_("Not a valid LDAP DN")
1468
		raise univention.admin.uexceptions.valueError,_("Not a valid LDAP DN")
1469
1469
1470
class ldapObjectClass(simple):
1471
	@classmethod
1472
	def parse(self, text):
1473
		return text
1474
1470
1475
class ldapAttribute(simple):
1471
class ldapObjectClass(select):
1476
	@classmethod
1472
	choices = (('top', 'top'))
1477
	def parse(self, text):
1473
1478
		return text
1474
1475
class ldapAttribute(select):
1476
	choices = ()
1477
1478
1479
def _update_schema():
1480
	from univention.uldap import getMachineConnection
1481
	from ldap.schema import (SubSchema, ObjectClass, AttributeType)
1482
	conn = getMachineConnection()
1483
	try:
1484
		results = conn.lo.search_ext_s(
1485
			base='cn=Subschema',
1486
			scope=ldap.SCOPE_BASE,
1487
			attrlist=['attributeTypes', 'objectClasses'])
1488
		result, = results
1489
		dn, entry = result
1490
		subschema = SubSchema(entry)
1491
1492
		sorter = lambda s: s.lower()
1493
		ocs = set()
1494
		for oid in subschema.listall(ObjectClass):
1495
			oc = subschema.get_obj(ObjectClass, oid)
1496
			ocs |= set(oc.names)
1497
		ldapObjectClass.choices = [(oc, oc) for oc in sorted(ocs, key=sorter)]
1498
		attrs = set()
1499
		for oid in subschema.listall(AttributeType):
1500
			attr = subschema.get_obj(AttributeType, oid)
1501
			attrs |= set(attr.names)
1502
		ldapAttribute.choices = [(attr, attr) for attr in sorted(attrs, key=sorter)]
1503
	except ldap.SERVER_DOWN:
1504
		pass
1505
	finally:
1506
		conn.lo.unbind()
1507
__register_choice_update_function(_update_schema)
1508
1479
1509
1480
class ldapFilter(simple):
1510
class ldapFilter(simple):
1481
1511
 Lines 2522-2528   class MinuteSimple(select): Link Here 
2522
class UNIX_AccessRight( simple ):
2552
class UNIX_AccessRight( simple ):
2523
	pass
2553
	pass
2524
2554
2525
# Widget supports setgid/sticky bit 
2555
# Widget supports setgid/sticky bit
2526
class UNIX_AccessRight_extended( simple ):
2556
class UNIX_AccessRight_extended( simple ):
2527
	pass
2557
	pass
2528
2558
 Lines 2612-2629   class univentionAdminModules(select): Link Here 
2612
				return text
2642
				return text
2613
		raise univention.admin.uexceptions.valueInvalidSyntax, _('"%s" is not a Univention Admin Module.') % text
2643
		raise univention.admin.uexceptions.valueInvalidSyntax, _('"%s" is not a Univention Admin Module.') % text
2614
2644
2615
# Unfortunately, Python doesn't seem to support (static) class methods;
2645
	@classmethod
2616
# however, (static) class variables such as "choices" seem to work;
2646
	def _update_choices(cls):
2617
# so, we'll modify "choices" using this global method
2647
		cls.choices = sorted([
2618
def univentionAdminModules_update():
2648
			(name, univention.admin.modules.short_description(mod))
2619
	temp = []
2649
			for name, mod in univention.admin.modules.modules.items()
2620
	for name, mod in univention.admin.modules.modules.items():
2650
			if not univention.admin.modules.virtual(mod)
2621
		if not univention.admin.modules.virtual( mod ):
2651
		] , key=operator.itemgetter(1))
2622
			temp.append( ( name, univention.admin.modules.short_description( mod ) ) )
2623
2624
	univentionAdminModules.choices = sorted( temp, key = operator.itemgetter( 1 ) )
2625
2652
2626
__register_choice_update_function(univentionAdminModules_update)
2653
__register_choice_update_function(univentionAdminModules._update_choices)
2627
2654
2628
class UDM_PropertySelect( complex ):
2655
class UDM_PropertySelect( complex ):
2629
	subsyntaxes = ( ( _( 'UDM module' ), string ), ( _( 'property' ), string ) )
2656
	subsyntaxes = ( ( _( 'UDM module' ), string ), ( _( 'property' ), string ) )
 Lines 2707-2717   class LDAP_Search( select ): Link Here 
2707
	Searches can be either defined dynamically via a UDM settings/syntax
2734
	Searches can be either defined dynamically via a UDM settings/syntax
2708
	definition and using
2735
	definition and using
2709
2736
2710
	>>> LDAP_Search( syntax_name = '<NAME>' )
2737
	> LDAP_Search( syntax_name = '<NAME>' )
2711
2738
2712
	or programmatically	by directly instantiating
2739
	or programmatically	by directly instantiating
2713
2740
2714
	>>> LDAP_Search( filter = '<LDAP-Search-Filter>', attribute = [ '<LDAP attributes>', ... ], value = '<LDAP attribute>', base = '<LDAP base>' )
2741
	> LDAP_Search( filter = '<LDAP-Search-Filter>', attribute = [ '<LDAP attributes>', ... ], value = '<LDAP attribute>', base = '<LDAP base>' )
2715
	"""
2742
	"""
2716
	FILTER_PATTERN = '(&(objectClass=univentionSyntax)(cn=%s))'
2743
	FILTER_PATTERN = '(&(objectClass=univentionSyntax)(cn=%s))'
2717
2744
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-management-console-module-udm/debian/changelog (+6 lines)
 Lines 1-3    Link Here 
1
univention-management-console-module-udm (5.1.25-71) unstable; urgency=low
2
3
  * Bug #31857: provide list of objectClasses and attributeTypes
4
5
 -- Philipp Hahn <hahn@univention.de>  Thu, 18 Jun 2015 12:25:49 +0200
6
1
univention-management-console-module-udm (5.1.25-70) unstable; urgency=medium
7
univention-management-console-module-udm (5.1.25-70) unstable; urgency=medium
2
8
3
  * Bug #38544: handle errors when no object type is given via request.options
9
  * Bug #38544: handle errors when no object type is given via request.options
(-)a/branches/ucs-4.0/ucs-4.0-2/management/univention-management-console-module-udm/umc/python/udm/syntax.py (-1 / +4 lines)
 Lines 39-44   import univention.admin.syntax as udm_syntax Link Here 
39
from ...log import MODULE
39
from ...log import MODULE
40
40
41
41
42
# update choices-lists which are defined in LDAP
43
udm_syntax.update_choices()
44
45
42
class Widget(object):
46
class Widget(object):
43
47
44
	'''Describes a widget for the new web frontend'''
48
	'''Describes a widget for the new web frontend'''
45
- 

Return to bug 31857