Minor corrections to make it compile cleanly

diff --git a/src/scripts/MakeLinks b/src/scripts/MakeLinks
index 2eb8a967e8b3eea2fb890c41a96cb2b3357a28c0..5154031065530c7d89791d1e282bb749c00dbd57 100755 (executable)
--- a/src/scripts/MakeLinks
+++ b/src/scripts/MakeLinks
@@ -198,6 +198,7 @@ ln -s ../src/dns.c             dns.c
 ln -s ../src/drtables.c        drtables.c
 ln -s ../src/dummies.c         dummies.c
 ln -s ../src/enq.c             enq.c
 ln -s ../src/drtables.c        drtables.c
 ln -s ../src/dummies.c         dummies.c
 ln -s ../src/enq.c             enq.c

+ln -s ../src/environment.c     environment.c

 ln -s ../src/exim.c            exim.c
 ln -s ../src/exim_dbmbuild.c   exim_dbmbuild.c
 ln -s ../src/exim_dbutil.c     exim_dbutil.c
 ln -s ../src/exim.c            exim.c
 ln -s ../src/exim_dbmbuild.c   exim_dbmbuild.c
 ln -s ../src/exim_dbutil.c     exim_dbutil.c

diff --git a/src/src/environment.c b/src/src/environment.c
index aaa84f8172a0c9c66cfec98b1444d87931867e6f..673d2e609ba2195217585762f8b60e342d4946a6 100644 (file)
--- a/src/src/environment.c
+++ b/src/src/environment.c
@@ -31,7 +31,7 @@ else if (Ustrcmp(keep_environment, "*") != 0)
     {
     uschar *name = string_copyn(*p, US Ustrchr(*p, '=') - *p);
 
     {
     uschar *name = string_copyn(*p, US Ustrchr(*p, '=') - *p);
 

-    if (OK != match_isinlist(name, CUSS &keep_environment,
+    if (OK != match_isinlist(name, USS &keep_environment,

         0, NULL, NULL, MCL_NOEXPAND, FALSE, NULL))
       if (unsetenv(CS name) < 0) return FALSE;
       else /* nothing */;
         0, NULL, NULL, MCL_NOEXPAND, FALSE, NULL))
       if (unsetenv(CS name) < 0) return FALSE;
       else /* nothing */;


@@ -45,7 +45,7 @@ if (add_environment)
   {
     uschar *p;
     int sep = 0;
   {
     uschar *p;
     int sep = 0;

-    const uschar* envlist = add_environment;
+    uschar* envlist = add_environment;

     while ((p = string_nextinlist(&envlist, &sep, NULL, 0)))
         putenv(CS p);
   }
     while ((p = string_nextinlist(&envlist, &sep, NULL, 0)))
         putenv(CS p);
   }