[svn] GnuPG - r4461 - branches/STABLE-BRANCH-1-4/g10

[svn author dshaw]

Author: dshaw
Date: 2007-03-14 14:15:50 +0100 (Wed, 14 Mar 2007)
New Revision: 4461

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/keyserver.c
Log:
* keyserver.c: Windows Vista doesn't grok X_OK and so fails access()
tests.  Previous versions interpreted X_OK as F_OK anyway, so we'll
just use F_OK directly.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-03-14 04:24:55 UTC (rev 4460)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-03-14 13:15:50 UTC (rev 4461)
@@ -1,3 +1,9 @@
+2007-03-14  David Shaw  <dshaw at jabberwocky.com>
+
+	* keyserver.c: Windows Vista doesn't grok X_OK and so fails
+	access() tests.  Previous versions interpreted X_OK as F_OK
+	anyway, so we'll just use F_OK directly.
+
 2007-03-08  Werner Koch  <wk at g10code.com>
 
 	* plaintext.c (handle_plaintext): Add two extra fflush for stdout.

Modified: branches/STABLE-BRANCH-1-4/g10/keyserver.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/keyserver.c	2007-03-14 04:24:55 UTC (rev 4460)
+++ branches/STABLE-BRANCH-1-4/g10/keyserver.c	2007-03-14 13:15:50 UTC (rev 4461)
@@ -1,6 +1,6 @@
 /* keyserver.c - generic keyserver code
- * Copyright (C) 2001, 2002, 2003, 2004, 2005,
- *               2006 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
+ *               2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -41,6 +41,14 @@
 #include "keyserver-internal.h"
 #include "util.h"
 
+#ifdef HAVE_W32_SYSTEM
+/* It seems Vista doesn't grok X_OK and so fails access() tests.
+   Previous versions interpreted X_OK as F_OK anyway, so we'll just
+   use F_OK directly. */
+#undef X_OK
+#define X_OK F_OK
+#endif /* HAVE_W32_SYSTEM */
+
 struct keyrec
 {
   KEYDB_SEARCH_DESC desc;