Changeset 1781

Timestamp:

08/12/08 13:24:54 (5 months ago)

Author:

taher

Message:

Files:

cherokee/trunk/ChangeLog

r1778	r1781
	1	2008-08-12 Taher Shihadeh <taher@unixwars.com>
	2
	3	* admin/ModuleLdap.py, admin/ModuleMysql.py: removed unnecessary
	4	empty parameter checks for handlers that can provide default
	5	values.
	6
1	7	2008-08-12 Alvaro Lopez Ortega <alvaro@alobbs.com>
2	8

r1419	r1781
3	3
4	4	NOTE_SERVER = 'LDAP server IP address.'
5		NOTE_PORT = 'LDAP server port to connect to.'
6		NOTE_BIND_DOMAIN = 'Domain sent during the LDAP authentication operation.'
7		NOTE_BIND_PASSWD = 'Password ~~for authenticating~~ in the LDAP server.'
	5	NOTE_PORT = 'LDAP server port to connect to. Defaults to 389'
	6	NOTE_BIND_DOMAIN = 'Domain sent during the LDAP authentication operation. Optional.'
	7	NOTE_BIND_PASSWD = 'Password to authenticate in the LDAP server.'
8	8	NOTE_BASE_DOMAIN = 'Base domain for the web server authentications.'
9	9	NOTE_FILTER = 'Object filter. It can be empty.'
…	…
13	13	class ModuleLdap (ModuleAuthBase):
14	14	PROPERTIES = ModuleAuthBase.PROPERTIES + [
15		'server', 'port',
	15	'server', 'port',
16	16	'bind_dn', 'base_dn',
17		'filter', 'tls',
	17	'filter', 'tls',
18	18	'ca_file'
19	19	]
…	…
43	43	# These values must be filled out
44	44	for key, msg in [('server', 'Server'),
45		~~('bind_dn', 'Bind Domain'),~~
46	45	('base_dn', 'Base Domain')]:
47	46	pre = '%s!%s' % (self._prefix, key)
48	47	self.Validate_NotEmpty (post, pre, '%s can not be empty'%(msg))
49
	48
50	49	# Apply TLS
51	50	self.ApplyChangesPrefix (self._prefix, ['tls'], post)

r1780	r1781
43	43	def _op_apply_changes (self, uri, post):
44	44	# These values must be filled out
45		for key, msg in [('host', 'Host'),
46		('user', 'DB User'),
	45	for key, msg in [('user', 'DB User'),
47	46	('query', 'SQL query'),
48	47	('database', 'Database')]: