Attachment #249754 for bug #315877

Lines 20-29 Link Here

(-)__init__.py.old (-7 lines)
20	# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.	20	# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
21	#	21	#
22		22
23	import os, sys
24
25	ntlmaps_dir = os.path.dirname(os.path.abspath(__file__))
26	ntlmaps_libdir = ntlmaps_dir + '/lib'
27	sys.path.append(ntlmaps_libdir)
28
29	del os, sys

Lines 18-25 Link Here

(-)main.py.old (-3 / +1 lines)
18	# Free Software Foundation, Inc.,	18	# Free Software Foundation, Inc.,
19	# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.	19	# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
20	#	20	#
21	import __init__
22
23	import sys	21	import sys
24		22
25	import server, config, config_affairs	23	import server, config, config_affairs
Lines 28-34 Link Here
28	#--------------------------------------------------------------	26	#--------------------------------------------------------------
29	# config affairs	27	# config affairs
30	# look for default config name in lib/config.py	28	# look for default config name in lib/config.py
31	conf = config.read_config(config.findConfigFileNameInArgv(sys.argv, __init__.ntlmaps_dir+'/'))	29	conf = config.read_config('/etc/ntlmaps/server.cfg')
32		30
33	conf['GENERAL']['VERSION'] = '0.9.9.6'	31	conf['GENERAL']['VERSION'] = '0.9.9.6'
34		32

Return to bug 315877