summaryrefslogtreecommitdiffstats
path: root/openbsd-compat/openbsd-compat.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2015-10-29 00:48:23 +0100
committerDarren Tucker <dtucker@zip.com.au>2015-10-29 00:48:23 +0100
commit8db134e7f457bcb069ec72bc4ee722e2af557c69 (patch)
treea0d16eb42cc7d97396504b75163b812468811269 /openbsd-compat/openbsd-compat.h
parentupstream commit (diff)
downloadopenssh-8db134e7f457bcb069ec72bc4ee722e2af557c69.tar.xz
openssh-8db134e7f457bcb069ec72bc4ee722e2af557c69.zip
Prevent name collisions with system glob (bz#2463)
Move glob.h from includes.h to the only caller (sftp) and override the names for the symbols. This prevents name collisions with the system glob in the case where something other than ssh uses it (eg kerberos). With jjelen at redhat.com, ok djm@
Diffstat (limited to 'openbsd-compat/openbsd-compat.h')
-rw-r--r--openbsd-compat/openbsd-compat.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 1ff7114ef..8cc8a11b7 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -39,7 +39,6 @@
/* OpenBSD function replacements */
#include "base64.h"
#include "sigact.h"
-#include "glob.h"
#include "readpassphrase.h"
#include "vis.h"
#include "getrrsetbyname.h"