ph10 2006/03/16 12:25:24 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/OS os.Configuring os.h-BSDI os.h-FreeBSD
os.h-NetBSD
exim-src/src exim.c
exim-src/src/transports pipe.c
Log:
Change HAVE_LOGIN_CAP to HAVE_SETCLASSRESOURCES because the former isn't
an accurate name (different APIs use login_cap.h, apparently).
Revision Changes Path
1.331 +5 -0 exim/exim-doc/doc-txt/ChangeLog
1.3 +3 -2 exim/exim-src/OS/os.Configuring
1.3 +1 -1 exim/exim-src/OS/os.h-BSDI
1.3 +1 -1 exim/exim-src/OS/os.h-FreeBSD
1.3 +0 -1 exim/exim-src/OS/os.h-NetBSD
1.38 +2 -2 exim/exim-src/src/exim.c
1.11 +3 -3 exim/exim-src/src/transports/pipe.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- ChangeLog 16 Mar 2006 12:07:55 -0000 1.330
+++ ChangeLog 16 Mar 2006 12:25:24 -0000 1.331
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.330 2006/03/16 12:07:55 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -313,6 +313,11 @@
having set something in $address_data, the value of $address_data was not
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
Index: os.Configuring
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/os.Configuring,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- os.Configuring 21 Feb 2006 16:24:19 -0000 1.2
+++ os.Configuring 16 Mar 2006 12:25:24 -0000 1.3
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/OS/os.Configuring,v 1.2 2006/02/21 16:24:19 ph10 Exp $
+$Cambridge: exim/exim-src/OS/os.Configuring,v 1.3 2006/03/16 12:25:24 ph10 Exp $
Configuring Exim for different Operating Systems
------------------------------------------------
@@ -188,8 +188,9 @@
-------------------------------
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
------------------
Index: os.h-BSDI
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/os.h-BSDI,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- os.h-BSDI 21 Feb 2006 16:24:19 -0000 1.2
+++ os.h-BSDI 16 Mar 2006 12:25:24 -0000 1.3
@@ -1,9 +1,9 @@
-/* $Cambridge: exim/exim-src/OS/os.h-BSDI,v 1.2 2006/02/21 16:24:19 ph10 Exp $ */
+/* $Cambridge: exim/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
-#define HAVE_LOGIN_CAP
+#define HAVE_SETCLASSRESOURCES
#define HAVE_MMAP
#define HAVE_SYS_MOUNT_H
#define SIOCGIFCONF_GIVES_ADDR
Index: os.h-FreeBSD
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/os.h-FreeBSD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- os.h-FreeBSD 21 Feb 2006 16:24:19 -0000 1.2
+++ os.h-FreeBSD 16 Mar 2006 12:25:24 -0000 1.3
@@ -1,9 +1,9 @@
-/* $Cambridge: exim/exim-src/OS/os.h-FreeBSD,v 1.2 2006/02/21 16:24:19 ph10 Exp $ */
+/* $Cambridge: exim/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
-#define HAVE_LOGIN_CAP
+#define HAVE_SETCLASSRESOURCES
#define HAVE_MMAP
#define HAVE_SYS_MOUNT_H
#define SIOCGIFCONF_GIVES_ADDR
Index: os.h-NetBSD
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/os.h-NetBSD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- os.h-NetBSD 21 Feb 2006 16:24:19 -0000 1.2
+++ os.h-NetBSD 16 Mar 2006 12:25:24 -0000 1.3
@@ -1,9 +1,8 @@
-/* $Cambridge: exim/exim-src/OS/os.h-NetBSD,v 1.2 2006/02/21 16:24:19 ph10 Exp $ */
+/* $Cambridge: exim/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
-#define HAVE_LOGIN_CAP
#define HAVE_MMAP
#define HAVE_SYS_MOUNT_H
#define SIOCGIFCONF_GIVES_ADDR
Index: exim.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exim.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- exim.c 9 Mar 2006 15:10:16 -0000 1.37
+++ exim.c 16 Mar 2006 12:25:24 -0000 1.38
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/exim.c,v 1.37 2006/03/09 15:10:16 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/exim.c,v 1.38 2006/03/16 12:25:24 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -874,8 +874,8 @@
#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");
Index: pipe.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/pipe.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pipe.c 21 Feb 2006 16:24:20 -0000 1.10
+++ pipe.c 16 Mar 2006 12:25:24 -0000 1.11
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/pipe.c,v 1.10 2006/02/21 16:24:20 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/transports/pipe.c,v 1.11 2006/03/16 12:25:24 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -11,7 +11,7 @@
#include "../exim.h"
#include "pipe.h"
-#ifdef HAVE_LOGIN_CAP
+#ifdef HAVE_SETCLASSRESOURCES
#include <login_cap.h>
#endif
@@ -75,7 +75,7 @@
(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
@@ -154,7 +154,7 @@
errmsg = errmsg;
ob = ob;
-#ifdef HAVE_LOGIN_CAP
+#ifdef HAVE_SETCLASSRESOURCES
if (ob->use_classresources)
{
struct passwd *pw = getpwuid(uid);
