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/glob.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 'openbsd-compat/glob.h')
| -rw-r--r-- | openbsd-compat/glob.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h index f8a7fa5f..f069a05d 100644 --- a/openbsd-compat/glob.h +++ b/openbsd-compat/glob.h @@ -42,11 +42,15 @@ !defined(HAVE_DECL_GLOB_NOMATCH) || HAVE_DECL_GLOB_NOMATCH == 0 || \ defined(BROKEN_GLOB) -#ifndef _GLOB_H_ -#define _GLOB_H_ +#ifndef _COMPAT_GLOB_H_ +#define _COMPAT_GLOB_H_ #include <sys/stat.h> +# define glob_t _ssh_compat_glob_t +# define glob(a, b, c, d) _ssh__compat_glob(a, b, c, d) +# define globfree(a) _ssh__compat_globfree(a) + struct stat; typedef struct { int gl_pathc; /* Count of total paths so far. */ |