ntlmaps/paths.patch

   1 diff -Naur ntlmaps-0.9.9.0.1/__init__.py ntlmaps-0.9.9.0.1_new/__init__.py
   2 --- ntlmaps-0.9.9.0.1/__init__.py       2005-06-10 05:49:35.000000000 +0200
   3 +++ ntlmaps-0.9.9.0.1_new/__init__.py   2007-05-28 16:02:14.000000000 +0200
   4 @@ -20,10 +20,10 @@
   5  # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
   6  #
   7
   8 -import os, sys
   9 +#import os, sys
  10
  11 -ntlmaps_dir = os.path.dirname(os.path.abspath(__file__))
  12 -ntlmaps_libdir = ntlmaps_dir + '/lib'
  13 -sys.path.append(ntlmaps_libdir)
  14 +#ntlmaps_dir = os.path.dirname(os.path.abspath(__file__))
  15 +#ntlmaps_libdir = ntlmaps_dir
  16 +#sys.path.append(ntlmaps_libdir)
  17
  18 -del os, sys
  19 +#del os, sys
  20 diff -Naur ntlmaps-0.9.9.0.1/lib/config.py ntlmaps-0.9.9.0.1_new/lib/config.py
  21 --- ntlmaps-0.9.9.0.1/lib/config.py     2005-06-10 05:46:43.000000000 +0200
  22 +++ ntlmaps-0.9.9.0.1_new/lib/config.py 2007-05-28 15:59:49.000000000 +0200
  23 @@ -52,7 +52,7 @@
  24      the config file. Otherwise the function falls back to
  25      'server.cfg' in the current directory. """
  26
  27 -    configFileName = configFileDir+'server.cfg'
  28 +    configFileName = configFileDir+'ntlmaps'
  29
  30      optionsList, notUsedArguments = getopt.getopt(argv[1:], 'c:')
  31
  32 diff -Naur ntlmaps-0.9.9.0.1/main.py ntlmaps-0.9.9.0.1_new/main.py
  33 --- ntlmaps-0.9.9.0.1/main.py   2006-01-27 02:35:00.000000000 +0100
  34 +++ ntlmaps-0.9.9.0.1_new/main.py       2007-05-28 16:00:22.000000000 +0200
  35 @@ -18,17 +18,13 @@
  36  # Free Software Foundation, Inc.,
  37  # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  38  #
  39 -import __init__
  40 -
  41  import sys
  42 -
  43 -import server, config, config_affairs
  44 -
  45 +from ntlmaps import server, config, config_affairs
  46
  47  #--------------------------------------------------------------
  48  # config affairs
  49  # look for default config name in lib/config.py
  50 -conf = config.read_config(config.findConfigFileNameInArgv(sys.argv, __init__.ntlmaps_dir+'/'))
  51 +conf = config.read_config(config.findConfigFileNameInArgv(sys.argv, '/etc/conf.d/'))
  52
  53  conf['GENERAL']['VERSION'] = '0.9.9.0.1'
  54