diff options
| author | David Shaw <[email protected]> | 2007-03-14 13:15:50 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2007-03-14 13:15:50 +0000 |
| commit | 994ab24b4becae44b1f61049634af45798e32e1c (patch) | |
| tree | e72142e048dfd058dc5c8c90443f95e8089c49c3 | |
| parent | * gpgkeys_curl.c (main): Use curl_version_info to verify that the (diff) | |
| download | gnupg-994ab24b4becae44b1f61049634af45798e32e1c.tar.gz gnupg-994ab24b4becae44b1f61049634af45798e32e1c.zip | |
* 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.
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/keyserver.c | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 51f00d5de..611caa0f0 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2007-03-14 David Shaw <[email protected]> + + * 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 <[email protected]> * plaintext.c (handle_plaintext): Add two extra fflush for stdout. diff --git a/g10/keyserver.c b/g10/keyserver.c index 4f692457b..b14d30087 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -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; |