X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/059ec3d9952740285fb1ebf47961b8aca2eb1b4a..4226691b79845d9b41041e2f64a3a241dcb99f4d:/src/src/exim_checkaccess.src

diff --git a/src/src/exim_checkaccess.src b/src/src/exim_checkaccess.src
index 8169243bf..a780a298a 100755
--- a/src/src/exim_checkaccess.src
+++ b/src/src/exim_checkaccess.src
@@ -1,7 +1,6 @@
 #! /bin/sh
-# $Cambridge: exim/src/src/exim_checkaccess.src,v 1.1 2004/10/07 10:39:01 ph10 Exp $
 
-# Copyright (c) 2002 University of Cambridge.
+# Copyright (c) University of Cambridge, 1995 - 2007
 # See the file NOTICE for conditions of use and distribution.
 
 # Except when they appear in comments, the following placeholders in this
@@ -52,8 +51,7 @@ done
 # a nasty tendency to get lost in the past. Use a variable to hold a space and
 # a tab to keep the tab in one place.
 
-st='	 '
-exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
+exim_path=`perl -ne 'chop;if (/^\s*exim_path\s*=\s*(.*)/){print "$1\n";last;}' $config`
 if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
 
 
@@ -65,6 +63,7 @@ if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
 
 PERL_COMMAND - $exim_path $args <<'End'
 
+BEGIN { pop @INC if $INC[-1] eq '.' };
 use FileHandle;
 use IPC::Open2;