diff options
author | Werner Koch <[email protected]> | 2018-03-06 15:26:26 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2018-03-06 15:26:26 +0000 |
commit | f574aabeeb873f14a586f80cac16b857e6088534 (patch) | |
tree | e84428513719a4e50cb1df1be509c12d34eb434a /tools/gpgconf-comp.c | |
parent | gpg: Avoid writing a zero length last chunk in AEAD mode. (diff) | |
parent | agent: Also evict cached items via a timer. (diff) | |
download | gnupg-f574aabeeb873f14a586f80cac16b857e6088534.tar.gz gnupg-f574aabeeb873f14a586f80cac16b857e6088534.zip |
Merge branch 'STABLE-BRANCH-2-2' into wk-master
Diffstat (limited to 'tools/gpgconf-comp.c')
-rw-r--r-- | tools/gpgconf-comp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 099f43952..924f90785 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -2076,7 +2076,9 @@ get_config_filename (gc_component_t component, gc_backend_t backend) #elif defined(HAVE_DOSISH_SYSTEM) if (!(filename[0] && filename[1] == ':' - && (filename[2] == '/' || filename[2] == '\\'))) + && (filename[2] == '/' || filename[2] == '\\')) /* x:\ or x:/ */ + && !((filename[0] == '\\' && filename[1] == '\\') + || (filename[0] == '/' && filename[1] == '/'))) /* \\server */ #else if (filename[0] != '/') #endif |