From 2c5db4fd26b481bff53f546eed83d373db4f130b Mon Sep 17 00:00:00 2001
From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Wed, 8 Mar 2006 09:43:10 +0000
Subject: [PATCH] New os.c-cygwin (and some minor WishList change I forgot to
 commit).

---
 doc/doc-misc/WishList | 10 ++--------
 doc/doc-txt/ChangeLog |  4 +++-
 src/OS/os.c-cygwin    |  8 +++++---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/doc/doc-misc/WishList b/doc/doc-misc/WishList
index 572a8d5c1..3f70a9d64 100644
--- a/doc/doc-misc/WishList
+++ b/doc/doc-misc/WishList
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-misc/WishList,v 1.63 2006/03/02 15:13:59 ph10 Exp $
+$Cambridge: exim/doc/doc-misc/WishList,v 1.64 2006/03/08 09:43:10 ph10 Exp $
 
 EXIM 4 WISH LIST
 ----------------
@@ -1442,12 +1442,6 @@ this reason, I don't really like this idea.
 (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 @@ headers should be re-planned and re-implemented in a more consistent manner.
 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
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 22f7b34e9..909570c9e 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.323 2006/03/07 20:58:55 jetmore Exp $
+$Cambridge: 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
 -------------------------------------------
@@ -278,6 +278,8 @@ PH/54 Added control=allow_auth_unadvertised, as it seems there are clients that
 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,
       and -bpra.  Now also available in native and exiqgrep formats)
diff --git a/src/OS/os.c-cygwin b/src/OS/os.c-cygwin
index 56b5a7184..f7230ac8d 100644
--- a/src/OS/os.c-cygwin
+++ b/src/OS/os.c-cygwin
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/OS/os.c-cygwin,v 1.4 2005/10/03 09:53:38 ph10 Exp $ */
+/* $Cambridge: 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 @@ unsigned int cygwin_WinVersion;
 #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 @@ static DWORD get_privileges ()
               && 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))
-- 
2.30.2