diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2015-10-29 10:48:23 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2015-10-29 10:48:23 +1100 |
| commit | 8db134e7f457bcb069ec72bc4ee722e2af557c69 (patch) | |
| tree | a0d16eb42cc7d97396504b75163b812468811269 /openbsd-compat/openbsd-compat.h | |
| parent | 86c10dbbef6a5800d2431a66cf7f41a954bb62b5 (diff) | |
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.h | 1 |
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 @@ | |||
| 39 | /* OpenBSD function replacements */ | 39 | /* OpenBSD function replacements */ |
| 40 | #include "base64.h" | 40 | #include "base64.h" |
| 41 | #include "sigact.h" | 41 | #include "sigact.h" |
| 42 | #include "glob.h" | ||
| 43 | #include "readpassphrase.h" | 42 | #include "readpassphrase.h" |
| 44 | #include "vis.h" | 43 | #include "vis.h" |
| 45 | #include "getrrsetbyname.h" | 44 | #include "getrrsetbyname.h" |