oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Don't override the PATH_SEP definition if present

Browse Source 
PATH_SEP is declared on Windows to be ";" and not ":"
by include/config.h.w32.

lib/base/context.c and lib/hx509.c must not override an existing
setting.  Otherwise, file lists cannot be separated and will be
treated as a single file name.

Change-Id: I5521188faca36e41fbae95fbb8942970eab261c8
This commit is contained in:
Jeffrey Altman
2020-05-25 14:43:15 -04:00
committed by Nicolas Williams
parent 6bdbf3ca27
commit aa47b5f1a3
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base/context.c
View File

@@ -176,7 +176,9 @@ heim_set_debug_dest(heim_context context, heim_log_facility *fac)
return 0; return 0;
} }
#define PATH_SEP ":" #ifndef PATH_SEP
# define PATH_SEP ":"
#endif
static heim_error_code static heim_error_code
add_file(char ***pfilenames, int *len, char *file) add_file(char ***pfilenames, int *len, char *file)

4
lib/hx509/cert.c
View File

@@ -125,7 +125,9 @@ hx509_get_instance(const char *libname)
return 0; return 0;
} }
#define PATH_SEP ":" #ifndef PATH_SEP
# define PATH_SEP ":"
#endif
static const char *hx509_config_file = static const char *hx509_config_file =
"~/.hx509/config" PATH_SEP "~/.hx509/config" PATH_SEP
SYSCONFDIR "/hx509.conf" PATH_SEP SYSCONFDIR "/hx509.conf" PATH_SEP