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

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py (-32 / +16 lines)
 Lines 2304-2364   class object(univention.admin.handlers.simpleLdap): Link Here 
2304 
		elif filter.variable == 'disabled':
 2304 
		elif filter.variable == 'disabled':
2305 
			# substring match for userPassword is not possible
 2305 
			# substring match for userPassword is not possible
2306 
			if filter.value == '1':
 2306 
			if filter.value == '1':
2307 
				filter.variable = '&(shadowExpire=1)(krb5KDCFlags:1.2.840.113556.1.4.803:=128)(|(sambaAcctFlags=[UD       ])(sambaAcctFlags'
 2307 
				filter.transform_to_conjunction(univention.admin.filter.parse('(&(shadowExpire=1)(krb5KDCFlags:1.2.840.113556.1.4.803:=128)(|(sambaAcctFlags=[UD       ])(sambaAcctFlags=[ULD       ])))'))
2308 
				filter.value = '[ULD       ]))'
2309 
			elif filter.value == '0':
 2308 
			elif filter.value == '0':
2310 
				filter.variable = '&(!(shadowExpire=1))(!(krb5KDCFlags:1.2.840.113556.1.4.803:=128))(!(|(sambaAcctFlags=[UD       ])(sambaAcctFlags'
 2309 
				filter.transform_to_conjunction(univention.admin.filter.parse('(&(!(shadowExpire=1))(!(krb5KDCFlags:1.2.840.113556.1.4.803:=128))(!(|(sambaAcctFlags=[UD       ])(sambaAcctFlags=[ULD       ]))))'))
2311 
				filter.value = '[ULD       ])))'
2312 
			if filter.value == 'none':
 2310 
			if filter.value == 'none':
2313 
				filter.variable = '&(!(shadowExpire=1))(!(krb5KDCFlags:1.2.840.113556.1.4.803:=128))(!(|(sambaAcctFlags=[UD       ])(sambaAcctFlags'
 2311 
				filter.transform_to_conjunction(univention.admin.filter.parse('(&(!(shadowExpire=1))(!(krb5KDCFlags:1.2.840.113556.1.4.803:=128))(!(|(sambaAcctFlags=[UD       ])(sambaAcctFlags=[ULD       ]))))'))
2314 
				filter.value = '[ULD       ])))'
2315 
			elif filter.value == 'all':
 2312 
			elif filter.value == 'all':
2316 
				filter.variable = '&(shadowExpire=1)(krb5KDCFlags:1.2.840.113556.1.4.803:=128)(|(sambaAcctFlags=[UD       ])(sambaAcctFlags'
 2313 
				filter.transform_to_conjunction(univention.admin.filter.parse('(&(shadowExpire=1)(krb5KDCFlags:1.2.840.113556.1.4.803:=128)(|(sambaAcctFlags=[UD       ])(sambaAcctFlags=[ULD       ])))'))
2317 
				filter.value = '[ULD       ]))'
2318 
			elif filter.value == 'posix':
 2314 
			elif filter.value == 'posix':
2319 
				filter.variable = 'shadowExpire'
 2315 
				filter.variable = 'shadowExpire'
2320 
				filter.value = '1'
 2316 
				filter.value = '1'
2321 
			elif filter.value == 'kerberos':
 2317 
			elif filter.value == 'kerberos':
2322 
				filter.variable = 'krb5KDCFlags:1.2.840.113556.1.4.803:'
 2318 
				filter.transform_to_conjunction(univention.admin.filter.parse('(&(krb5KDCFlags:1.2.840.113556.1.4.803:=128))'))
2323 
				filter.value = '128'
2324 
			elif filter.value == 'windows':
 2319 
			elif filter.value == 'windows':
2325 
				filter.variable = '|(sambaAcctFlags=[UD       ])(sambaAcctFlags'
 2320 
				filter.transform_to_conjunction(univention.admin.filter.parse('(|(sambaAcctFlags=[UD       ])(sambaAcctFlags==[ULD       ]))'))
2326 
				filter.value = '=[ULD       ])'
2327 
			elif filter.value == 'windows_kerberos':
 2321 
			elif filter.value == 'windows_kerberos':
2328 
				filter.variable = '&(krb5KDCFlags:1.2.840.113556.1.4.803:=128)(|(sambaAcctFlags=[UD       ])(sambaAcctFlags'
 2322 
				filter.transform_to_conjunction(univention.admin.filter.parse('(&(krb5KDCFlags:1.2.840.113556.1.4.803:=128)(|(sambaAcctFlags=[UD       ])(sambaAcctFlags==[ULD       ])))'))
2329 
				filter.value = '=[ULD       ]))'
2330 
			elif filter.value == 'windows_posix':
 2323 
			elif filter.value == 'windows_posix':
2331 
				filter.variable = '&(shadowExpire=1)(|(sambaAcctFlags=[UD       ])(sambaAcctFlags'
 2324 
				filter.transform_to_conjunction(univention.admin.filter.parse('(&(shadowExpire=1)(|(sambaAcctFlags=[UD       ])(sambaAcctFlags==[ULD       ])))'))
2332 
				filter.value = '=[ULD       ]))'
2333 
			elif filter.value == 'posix_kerberos':
 2325 
			elif filter.value == 'posix_kerberos':
2334 
				filter.variable = '&(shadowExpire=1)(krb5KDCFlags'
 2326 
				filter.transform_to_conjunction(univention.admin.filter.parse('(&(shadowExpire=1)(krb5KDCFlags=254))'))
2335 
				filter.value = '254)'
2336 
			elif filter.value == '*':
 2327 
			elif filter.value == '*':
2337 
				filter.variable = 'uid'
 2328 
				filter.variable = 'uid'
2338 
		elif filter.variable == 'locked':
 2329 
		elif filter.variable == 'locked':
2339 
			if filter.value == '1':
 2330 
			if filter.value == '1':
2340 
				filter.variable = '|(krb5KDCFlags:1.2.840.113556.1.4.803:=131072)(sambaAcctFlags=[UL       ])(sambaAcctFlags'
 2331 
				filter.transform_to_conjunction(univention.admin.filter.parse('(|(krb5KDCFlags:1.2.840.113556.1.4.803:=131072)(sambaAcctFlags=[UL       ])(sambaAcctFlags=[ULD       ]))'))
2341 
				filter.value = '[ULD       ])'
2342 
			elif filter.value == '0':
 2332 
			elif filter.value == '0':
2343 
				filter.variable = '&(!(krb5KDCFlags:1.2.840.113556.1.4.803:=131072))(!(sambaAcctFlags=[UL       ]))(!(sambaAcctFlags'
 2333 
				filter.transform_to_conjunction(univention.admin.filter.parse('(&(!(krb5KDCFlags:1.2.840.113556.1.4.803:=131072))(!(sambaAcctFlags=[UL       ]))(!(sambaAcctFlags=[ULD       ])))'))
2344 
				filter.value = '[ULD       ]))'
2345 
			if filter.value in ['posix', 'windows', 'all', 'none']:
 2334 
			if filter.value in ['posix', 'windows', 'all', 'none']:
2346 
				if filter.value == 'all':
 2335 
				if filter.value == 'all':
2347 
					filter.variable = '|(sambaAcctFlags=[UL       ])(sambaAcctFlags'
 2336 
					filter.transform_to_conjunction(univention.admin.filter.parse('(|(sambaAcctFlags=[UL       ])(sambaAcctFlags=[ULD       ]))'))
2348 
					filter.value = '[ULD       ])'
 2337 
					# filter.transform_to_conjunction(univention.admin.filter.parse('(|(sambaAcctFlags=[UL       ])(sambaAcctFlags=[ULD       ])(userPassword={crypt}!*))'))
2349 
					# filter.variable='|(sambaAcctFlags=[UL       ])(sambaAcctFlags=[ULD       ])(userPassword'
2350 
					# filter.value = '{crypt}!*)'
2351 
				if filter.value == 'windows':
 2338 
				if filter.value == 'windows':
2352 
					filter.variable = '|(sambaAcctFlags=[UL       ])(sambaAcctFlags'
 2339 
					filter.transform_to_conjunction(univention.admin.filter.parse('(|(sambaAcctFlags=[UL       ])(sambaAcctFlags=[ULD       ]))'))
2353 
					filter.value = '[ULD       ])'
2354 
				# if filter.value == 'posix':
 2340 
				# if filter.value == 'posix':
2355 
				#	filter.variable='userPassword'
 2341 
				#	filter.variable='userPassword'
2356 
				#	filter.value = '{crypt}!*'
 2342 
				#	filter.value = '{crypt}!*'
2357 
				if filter.value == 'none':
 2343 
				if filter.value == 'none':
2358 
					# filter.variable='&(!(sambaAcctFlags=[UL       ]))(!(sambaAcctFlags=[ULD       ]))(!(userPassword'
 2344 
					# filter.transform_to_conjunction(univention.admin.filter.parse('(&(!(sambaAcctFlags=[UL       ]))(!(sambaAcctFlags=[ULD       ]))(!(userPassword={crypt}!*)))'))
2359 
					# filter.value = '{crypt}!*))'
 2345 
					filter.transform_to_conjunction(univention.admin.filter.parse('(&(!(sambaAcctFlags=[UL       ]))(!(sambaAcctFlags=[ULD       ])))'))
2360 
					filter.variable = '&(!(sambaAcctFlags=[UL       ]))(!(sambaAcctFlags'
2361 
					filter.value = '[ULD       ]))'
2362 
			elif filter.value == '*':
 2346 
			elif filter.value == '*':
2363 
				filter.variable = 'uid'
 2347 
				filter.variable = 'uid'
2364 
		else:
 2348 
		else:

Return to bug 50236