summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2015-07-06 17:15:44 +0100
committerAdam Jackson <ajax@redhat.com>2015-09-21 13:07:02 -0400
commitcdd1d58159140759052ec043bc9828d94ba97bc7 (patch)
treee3333e4eaa8c01c1ecd806dce2f180729749be2c /os
parentf8a2c087c89ed5b638a2e62987f255d3f04f914e (diff)
mingw: Fix NO_LOCAL_CLIENT_CRED build
Commit 4b4b9086 "os: support new implicit local user access mode [CVE-2015-3164 2/3]" carefully places the relevant code it adds under !NO_LOCAL_CLIENT_CRED, but unfortunately doesn't notice that NO_LOCAL_CLIENT_CRED is defined as a side-effect in the middle of GetLocalClientCreds(), so many of these checks precede its definition. Move the check if NO_LOCAL_CLIENT_CRED should be defined to configure.ac, so it always occurs before it's first use. v2: Move check to configure.ac v3: Use AC_CACHE_CHECK and name cache varaible appropriately [ajax: Massaged commit message] Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Ray Strode <rstrode@redhat.com>
Diffstat (limited to 'os')
-rw-r--r--os/access.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/os/access.c b/os/access.c
index 75e7a6983..54f069024 100644
--- a/os/access.c
+++ b/os/access.c
@@ -1221,7 +1221,6 @@ GetLocalClientCreds(ClientPtr client, LocalClientCredRec ** lccp)
#endif
#else
/* No system call available to get the credentials of the peer */
-#define NO_LOCAL_CLIENT_CRED
return -1;
#endif
}