Change HAVE_LOGIN_CAP to HAVE_SETCLASSRESOURCES because the former isn't

an accurate name (different APIs use login_cap.h, apparently).

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 6757288550264d03c957418690489a22a23031bc..e281f6860c7332e918259cba888940955099ec7a 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.330 2006/03/16 12:07:55 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.331 2006/03/16 12:25:24 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -314,6 +314,11 @@ PH/62 When verifying, if an address was redirected to one new address, so that
       passed back to the ACL. This was different to the case when no
       redirection occurred. The value is now passed back in both cases.
 
       passed back to the ACL. This was different to the case when no
       redirection occurred. The value is now passed back in both cases.
 

+PH/63 Changed the macro HAVE_LOGIN_CAP (see PH/41 for this release above) to
+      HAVE_SETCLASSRESOURCES because there are different APIs in use that all
+      use login_cap.h, so on its own it isn't the distinguishing feature. The
+      new name refers directly to the setclassresources() function.
+

 
 Exim version 4.60
 -----------------
 
 Exim version 4.60
 -----------------

diff --git a/src/OS/os.Configuring b/src/OS/os.Configuring
index 62ab83a15fbcda27cb4e02e72fcb2072cff58b0c..0adb96a6fbeab6094306d04b787e46f137b0082b 100644 (file)
--- a/src/OS/os.Configuring
+++ b/src/OS/os.Configuring
@@ -1,4 +1,4 @@
-$Cambridge: exim/src/OS/os.Configuring,v 1.2 2006/02/21 16:24:19 ph10 Exp $
+$Cambridge: exim/src/OS/os.Configuring,v 1.3 2006/03/16 12:25:24 ph10 Exp $

 
 Configuring Exim for different Operating Systems
 ------------------------------------------------
 
 Configuring Exim for different Operating Systems
 ------------------------------------------------


@@ -188,8 +188,9 @@ Support for login_cap functions
 -------------------------------
 
 Some of the BSD systems support functions for controlling the resources that
 -------------------------------
 
 Some of the BSD systems support functions for controlling the resources that

-user processes can use (e.g. login_getpwclass). If HAVE_LOGIN_CAP is defined,
-Exim supports this feature for running pipe deliveries.
+user processes can use (e.g. login_getpwclass). If HAVE_SETCLASSRESOURCES is
+defined, Exim supports this feature for running pipe deliveries, using the
+setclassresources() function.

 
 The crypt_h header
 ------------------
 
 The crypt_h header
 ------------------

diff --git a/src/OS/os.h-BSDI b/src/OS/os.h-BSDI
index c49a0ad864305c602a9e23bae22aa653a5d13bc0..cb3eeaf9179eeba0643e843ad76a2206991f07bb 100644 (file)
--- a/src/OS/os.h-BSDI
+++ b/src/OS/os.h-BSDI
@@ -1,9 +1,9 @@
-/* $Cambridge: exim/src/OS/os.h-BSDI,v 1.2 2006/02/21 16:24:19 ph10 Exp $ */
+/* $Cambridge: exim/src/OS/os.h-BSDI,v 1.3 2006/03/16 12:25:24 ph10 Exp $ */

 
 /* Exim: OS-specific C header file for BSDI */
 
 #define HAVE_BSD_GETLOADAVG
 
 /* Exim: OS-specific C header file for BSDI */
 
 #define HAVE_BSD_GETLOADAVG

-#define HAVE_LOGIN_CAP
+#define HAVE_SETCLASSRESOURCES

 #define HAVE_MMAP
 #define HAVE_SYS_MOUNT_H
 #define SIOCGIFCONF_GIVES_ADDR
 #define HAVE_MMAP
 #define HAVE_SYS_MOUNT_H
 #define SIOCGIFCONF_GIVES_ADDR

diff --git a/src/OS/os.h-FreeBSD b/src/OS/os.h-FreeBSD
index 091089f52ccc53f90a4ce162717d60b3c2500c0d..915f3b1219d41c7ea02ee98feed729f7aba73c96 100644 (file)
--- a/src/OS/os.h-FreeBSD
+++ b/src/OS/os.h-FreeBSD
@@ -1,9 +1,9 @@
-/* $Cambridge: exim/src/OS/os.h-FreeBSD,v 1.2 2006/02/21 16:24:19 ph10 Exp $ */
+/* $Cambridge: exim/src/OS/os.h-FreeBSD,v 1.3 2006/03/16 12:25:24 ph10 Exp $ */

 
 /* Exim: OS-specific C header file for FreeBSD */
 
 #define HAVE_BSD_GETLOADAVG
 
 /* Exim: OS-specific C header file for FreeBSD */
 
 #define HAVE_BSD_GETLOADAVG

-#define HAVE_LOGIN_CAP
+#define HAVE_SETCLASSRESOURCES

 #define HAVE_MMAP
 #define HAVE_SYS_MOUNT_H
 #define SIOCGIFCONF_GIVES_ADDR
 #define HAVE_MMAP
 #define HAVE_SYS_MOUNT_H
 #define SIOCGIFCONF_GIVES_ADDR

diff --git a/src/OS/os.h-NetBSD b/src/OS/os.h-NetBSD
index 7c3ae4f5ead950fea84972868cfc4e5b637c2fb0..2edcad9723cdb2c644b18c59f8dfa8820f6d9d1c 100644 (file)
--- a/src/OS/os.h-NetBSD
+++ b/src/OS/os.h-NetBSD
@@ -1,9 +1,8 @@
-/* $Cambridge: exim/src/OS/os.h-NetBSD,v 1.2 2006/02/21 16:24:19 ph10 Exp $ */
+/* $Cambridge: exim/src/OS/os.h-NetBSD,v 1.3 2006/03/16 12:25:24 ph10 Exp $ */

 
 /* Exim: OS-specific C header file for NetBSD */
 
 #define HAVE_BSD_GETLOADAVG
 
 /* Exim: OS-specific C header file for NetBSD */
 
 #define HAVE_BSD_GETLOADAVG

-#define HAVE_LOGIN_CAP

 #define HAVE_MMAP
 #define HAVE_SYS_MOUNT_H
 #define SIOCGIFCONF_GIVES_ADDR
 #define HAVE_MMAP
 #define HAVE_SYS_MOUNT_H
 #define SIOCGIFCONF_GIVES_ADDR

diff --git a/src/src/exim.c b/src/src/exim.c
index 30ea05c41eb07e0ddb559b02491e7225a5d96b24..9384cc192af714e8ebcaddcef8b73475c55a8afb 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/exim.c,v 1.37 2006/03/09 15:10:16 ph10 Exp $ */
+/* $Cambridge: exim/src/src/exim.c,v 1.38 2006/03/16 12:25:24 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -874,8 +874,8 @@ fprintf(f, "Support for:");
 #if HAVE_IPV6
   fprintf(f, " IPv6");
 #endif
 #if HAVE_IPV6
   fprintf(f, " IPv6");
 #endif

-#ifdef HAVE_LOGIN_CAP
-  fprintf(f, " use_classresources");
+#ifdef HAVE_SETCLASSRESOURCES
+  fprintf(f, " use_setclassresources");

 #endif
 #ifdef SUPPORT_PAM
   fprintf(f, " PAM");
 #endif
 #ifdef SUPPORT_PAM
   fprintf(f, " PAM");

diff --git a/src/src/transports/pipe.c b/src/src/transports/pipe.c
index 97d69db0feb64a3653f3412c971fa8aa6309e55a..7fbfc86cc95e4d4ff341bca12402324466a95236 100644 (file)
--- a/src/src/transports/pipe.c
+++ b/src/src/transports/pipe.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/transports/pipe.c,v 1.10 2006/02/21 16:24:20 ph10 Exp $ */
+/* $Cambridge: exim/src/src/transports/pipe.c,v 1.11 2006/03/16 12:25:24 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -11,7 +11,7 @@
 #include "../exim.h"
 #include "pipe.h"
 
 #include "../exim.h"
 #include "pipe.h"
 

-#ifdef HAVE_LOGIN_CAP
+#ifdef HAVE_SETCLASSRESOURCES

 #include <login_cap.h>
 #endif
 
 #include <login_cap.h>
 #endif
 


@@ -75,7 +75,7 @@ optionlist pipe_transport_options[] = {
       (void *)offsetof(pipe_transport_options_block, umask) },
   { "use_bsmtp",         opt_bool,
       (void *)offsetof(pipe_transport_options_block, use_bsmtp) },
       (void *)offsetof(pipe_transport_options_block, umask) },
   { "use_bsmtp",         opt_bool,
       (void *)offsetof(pipe_transport_options_block, use_bsmtp) },

-  #ifdef HAVE_LOGIN_CAP
+  #ifdef HAVE_SETCLASSRESOURCES

   { "use_classresources", opt_bool,
       (void *)offsetof(pipe_transport_options_block, use_classresources) },
   #endif
   { "use_classresources", opt_bool,
       (void *)offsetof(pipe_transport_options_block, use_classresources) },
   #endif


@@ -154,7 +154,7 @@ gid = gid;
 errmsg = errmsg;
 ob = ob;
 
 errmsg = errmsg;
 ob = ob;
 

-#ifdef HAVE_LOGIN_CAP
+#ifdef HAVE_SETCLASSRESOURCES

 if (ob->use_classresources)
   {
   struct passwd *pw = getpwuid(uid);
 if (ob->use_classresources)
   {
   struct passwd *pw = getpwuid(uid);