diff options
author | David Shaw <[email protected]> | 2007-03-14 13:26:18 +0000 |
---|---|---|
committer | David Shaw <[email protected]> | 2007-03-14 13:26:18 +0000 |
commit | 674530c3fa0e4431a96cbf157f21e83f421951da (patch) | |
tree | d874a734b127c92c5d3da9936d6c8ace93614c99 | |
parent | From STABLE-BRANCH-1-4 (diff) | |
download | gnupg-674530c3fa0e4431a96cbf157f21e83f421951da.tar.gz gnupg-674530c3fa0e4431a96cbf157f21e83f421951da.zip |
From STABLE-BRANCH-1-4
* 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.
Diffstat (limited to '')
-rw-r--r-- | g10/ChangeLog | 8 | ||||
-rw-r--r-- | g10/keyserver.c | 11 |
2 files changed, 17 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 3fa453348..3616e4b1a 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2007-03-14 David Shaw <[email protected]> + + From STABLE-BRANCH-1-4 + + * 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-09 David Shaw <[email protected]> From STABLE-BRANCH-1-4 diff --git a/g10/keyserver.c b/g10/keyserver.c index 049b971a9..e195e98df 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. * @@ -45,6 +45,13 @@ #include "dns-cert.h" #include "pka.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 { |