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 /sftp-client.h | |
| parent | 86c10dbbef6a5800d2431a66cf7f41a954bb62b5 (diff) | |
| download | openssh-git-8db134e7f457bcb069ec72bc4ee722e2af557c69.tar.gz | |
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 'sftp-client.h')
| -rw-r--r-- | sftp-client.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sftp-client.h b/sftp-client.h index f814b07d..14a3b818 100644 --- a/sftp-client.h +++ b/sftp-client.h @@ -21,6 +21,12 @@ #ifndef _SFTP_CLIENT_H #define _SFTP_CLIENT_H +#ifdef USE_SYSTEM_GLOB +# include <glob.h> +#else +# include "openbsd-compat/glob.h" +#endif + typedef struct SFTP_DIRENT SFTP_DIRENT; struct SFTP_DIRENT { |