[exim-cvs] cvs commit: exim/exim-src/src buildconfig.c

Top Page
Delete this message
Reply to this message
Author: Phil Pennock
Date:  
To: exim-cvs
Subject: [exim-cvs] cvs commit: exim/exim-src/src buildconfig.c
pdp 2010/06/07 19:25:57 BST

  Modified files:
    exim-src/src         buildconfig.c 
  Log:
  Run when EXIM_USER=notroot specified.


  Revision  Changes    Path
  1.19      +3 -2      exim/exim-src/src/buildconfig.c


  Index: buildconfig.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/buildconfig.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- buildconfig.c    7 Jun 2010 18:09:07 -0000    1.18
  +++ buildconfig.c    7 Jun 2010 18:25:57 -0000    1.19
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/buildconfig.c,v 1.18 2010/06/07 18:09:07 pdp Exp $ */
  +/* $Cambridge: exim/exim-src/src/buildconfig.c,v 1.19 2010/06/07 18:25:57 pdp Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -532,8 +532,9 @@
       steps to filter out the most obvious ones.  */


       if ((!uid_not_set && uid == 0) ||
  -        (strcmp(username, "root") == 0) ||
  -        (strcmp(username, "toor") == 0) )
  +        ((username != NULL) && (
  +          (strcmp(username, "root") == 0) ||
  +          (strcmp(username, "toor") == 0) )))
         {
         printf("\n*** Exim's internal user must not be root.\n\n");
         return 1;