--- __init__.py.old 2010-10-06 16:03:54.000000000 +0200 +++ __init__.py.old 2010-10-06 16:05:38.000000000 +0200 @@ -20,10 +20,3 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # -import os, sys - -ntlmaps_dir = os.path.dirname(os.path.abspath(__file__)) -ntlmaps_libdir = ntlmaps_dir + '/lib' -sys.path.append(ntlmaps_libdir) - -del os, sys --- main.py.old 2010-10-06 16:26:57.000000000 +0200 +++ main.py.old 2010-10-06 16:27:29.000000000 +0200 @@ -18,8 +18,6 @@ # Free Software Foundation, Inc., # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # -import __init__ - import sys import server, config, config_affairs @@ -28,7 +26,7 @@ #-------------------------------------------------------------- # config affairs # look for default config name in lib/config.py -conf = config.read_config(config.findConfigFileNameInArgv(sys.argv, __init__.ntlmaps_dir+'/')) +conf = config.read_config('/etc/ntlmaps/server.cfg') conf['GENERAL']['VERSION'] = '0.9.9.6'