ph10 2006/03/08 09:43:10 GMT
Modified files:
exim-doc/doc-misc WishList
exim-doc/doc-txt ChangeLog
exim-src/OS os.c-cygwin
Log:
New os.c-cygwin (and some minor WishList change I forgot to commit).
Revision Changes Path
1.64 +1 -7 exim/exim-doc/doc-misc/WishList
1.324 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.5 +4 -2 exim/exim-src/OS/os.c-cygwin
Index: WishList
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-misc/WishList,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- WishList 2 Mar 2006 15:13:59 -0000 1.63
+++ WishList 8 Mar 2006 09:43:10 -0000 1.64
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-misc/WishList,v 1.63 2006/03/02 15:13:59 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-misc/WishList,v 1.64 2006/03/08 09:43:10 ph10 Exp $
EXIM 4 WISH LIST
----------------
@@ -1442,12 +1442,6 @@
(236) 02-Feb-04 S String in local_scan that's added to the binary version string
------------------------------------------------------------------------------
-(237) 02-Feb-04 M Add_header in ACLs because "message" is overloaded
-
-This would be useful for verbs where "message" is an error message. See also
-333.
-------------------------------------------------------------------------------
-
(238) 05-Feb-04 S ${address to handle multiple addresses
At present, ${address expects to see just one address. An extension would let
@@ -1905,7 +1899,7 @@
These are the main previous items:
Exim 3 Wish List: 41, 85, 149, 187.
-Exim 4 Wish List: 55, 62, 63, 160, 212, 237, 270, 314, 328.
+Exim 4 Wish List: 55, 62, 63, 160, 212, 270, 314, 328.
------------------------------------------------------------------------------
(334) 07-Jun-05 M Support for messages larger than 2G
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- ChangeLog 7 Mar 2006 20:58:55 -0000 1.323
+++ ChangeLog 8 Mar 2006 09:43:10 -0000 1.324
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.323 2006/03/07 20:58:55 jetmore Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.324 2006/03/08 09:43:10 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -277,6 +277,8 @@
PH/55 Added the add_header modified to ACLs. The use of "message" with "warn"
will now be deprecated.
+
+PH/56 New os.c-cygwin from the Cygwin maintainer.
JJ/06 exipick: added --unsorted option to allow unsorted output in all output
formats (previously only available in exim formats via -bpr, -bpru,
Index: os.c-cygwin
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/os.c-cygwin,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- os.c-cygwin 3 Oct 2005 09:53:38 -0000 1.4
+++ os.c-cygwin 8 Mar 2006 09:43:10 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/OS/os.c-cygwin,v 1.4 2005/10/03 09:53:38 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/OS/os.c-cygwin,v 1.5 2006/03/08 09:43:10 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -49,6 +49,8 @@
#endif
#include <windows.h>
+#define EqualLuid(Luid1, Luid2) \
+ ((Luid1.LowPart == Luid2.LowPart) && (Luid1.HighPart == Luid2.HighPart))
#include <sys/cygwin.h>
/* Special static variables */
@@ -130,9 +132,9 @@
&& GetTokenInformation(hToken, TokenPrivileges,
privs, length, &length)))) {
for (i = 0; i < privs->PrivilegeCount; i++) {
- if (privs->Privileges[i].Luid.QuadPart == cluid.QuadPart)
+ if (EqualLuid(privs->Privileges[i].Luid, cluid))
ret |= CREATE_BIT;
- else if (privs->Privileges[i].Luid.QuadPart == rluid.QuadPart)
+ else if (EqualLuid(privs->Privileges[i].Luid, rluid))
ret |= RESTORE_BIT;
else continue;
if (ret == (CREATE_BIT | RESTORE_BIT))
