[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim…

Αρχική Σελίδα
Delete this message
Reply to this message
Συντάκτης: Philip Hazel
Ημερομηνία:  
Προς: exim-cvs
Αντικείμενο: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src/src acl.c macros.h
ph10 2005/01/12 12:51:55 GMT

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src/src         acl.c macros.h 
  Log:
  Fix compiler warnings in acl.c for bitmaps specified as ~something in
  unsigned ints.


  Revision  Changes    Path
  1.67      +4 -0      exim/exim-doc/doc-txt/ChangeLog
  1.14      +15 -0     exim/exim-src/src/acl.c
  1.8       +5 -8      exim/exim-src/src/macros.h


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- ChangeLog    12 Jan 2005 12:17:41 -0000    1.66
  +++ ChangeLog    12 Jan 2005 12:51:54 -0000    1.67
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.66 2005/01/12 12:17:41 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.67 2005/01/12 12:51:54 ph10 Exp $


Change log file for Exim from version 4.21
-------------------------------------------
@@ -299,6 +299,10 @@

   68. The host_aton() function was not handling scoped IPv6 addresses (those
       with, for example, "%eth0" on the end) correctly.
  +
  +69. Fixed some compiler warnings in acl.c for the bitmaps specified with
  +    negated items (that is, ~something) in unsigned ints. Some compilers
  +    apparently mutter when there is no cast.



Exim version 4.43

  Index: acl.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/acl.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- acl.c    12 Jan 2005 12:24:13 -0000    1.13
  +++ acl.c    12 Jan 2005 12:51:55 -0000    1.14
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/acl.c,v 1.13 2005/01/12 12:24:13 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/acl.c,v 1.14 2005/01/12 12:51:55 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -216,6 +216,7 @@


   static unsigned int cond_forbids[] = {
     0,                                               /* acl */
  +   
     (1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_CONNECT)|   /* authenticated */
       (1<<ACL_WHERE_HELO),


@@ -270,7 +271,9 @@

     (1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_CONNECT)|   /* encrypted */
       (1<<ACL_WHERE_HELO),
  +     
     0,                                               /* endpass */
  +   
     (1<<ACL_WHERE_NOTSMTP),                          /* hosts */


     (1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_AUTH)|      /* local_parts */
  @@ -282,6 +285,7 @@
       (1<<ACL_WHERE_VRFY),


     0,                                               /* log_message */
  +   
     0,                                               /* logwrite */


   #ifdef WITH_CONTENT_SCAN
  @@ -385,20 +389,30 @@
   #ifdef EXPERIMENTAL_BRIGHTMAIL
     0,                                               /* bmi_run */
   #endif
  +
     0,                                               /* error */
  +  
  +  (unsigned int) 
     ~(1<<ACL_WHERE_RCPT),                            /* caseful_local_part */
  +   
  +  (unsigned int) 
     ~(1<<ACL_WHERE_RCPT),                            /* caselower_local_part */
  +   
     (1<<ACL_WHERE_NOTSMTP),                          /* enforce_sync */
  +   
     (1<<ACL_WHERE_NOTSMTP),                          /* no_enforce_sync */


  +  (unsigned int) 
     ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)|       /* freeze */
       (1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
       (1<<ACL_WHERE_NOTSMTP)),


  +  (unsigned int) 
     ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)|       /* queue_only */
       (1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
       (1<<ACL_WHERE_NOTSMTP)),


  +  (unsigned int) 
     ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)|       /* submission */
       (1<<ACL_WHERE_PREDATA)),                       


  @@ -406,6 +420,7 @@
     (1<<ACL_WHERE_NOTSMTP),                          /* no_mbox_unspool */
   #endif


  +  (unsigned int) 
     ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)|       /* fakereject */
       (1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)),



  Index: macros.h
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/macros.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- macros.h    4 Jan 2005 10:00:42 -0000    1.7
  +++ macros.h    12 Jan 2005 12:51:55 -0000    1.8
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/macros.h,v 1.7 2005/01/04 10:00:42 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/macros.h,v 1.8 2005/01/12 12:51:55 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -742,18 +742,15 @@
   order without checking carefully! Furthermore, remember to keep these in step
   with the tables of names and response codes in globals.c. */


  -/* FIXME: the #ifdef below does not work here. Why? */
  -
   enum { ACL_WHERE_RCPT,       /* Some controls are for RCPT only */
          ACL_WHERE_MAIL,       /* )                                           */
          ACL_WHERE_PREDATA,    /* ) There are several tests for "in message", */
                                /* ) implemented by <= WHERE_NOTSMTP           */
  -                             /* )                                           */
  -#ifdef WITH_CONTENT_SCAN
  -       ACL_WHERE_MIME,       
  -#endif
  -       ACL_WHERE_DATA,       
  -       ACL_WHERE_NOTSMTP,    
  +#ifdef WITH_CONTENT_SCAN     /* )                                           */
  +       ACL_WHERE_MIME,       /* )                                           */
  +#endif                       /* )                                           */
  +       ACL_WHERE_DATA,       /* )                                           */
  +       ACL_WHERE_NOTSMTP,    /* )                                           */


          ACL_WHERE_AUTH,       /* These remaining ones are not currently    */
          ACL_WHERE_CONNECT,    /* required to be in a special order so they */