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

ISPATHSEP and ISTILDE macros; Windows portability

Browse Source 
Windows treats '\\' and '/' equivalently but we cannot control
the form that will be used by end users.  Introduce ISPATHSEP()
macro which tests only for '/' on UNIX and both on Windows.
Introduce ISTILDE() macro to test for '~'.   When testing for
'/' with strchr() or strrchr() add conditional checks for '\\' on
Windows.

Change-Id: Ia85e698fc88f15a6a71db649db5417f02ef7e5fe
This commit is contained in:
Jeffrey Altman
2013-09-10 21:57:07 -04:00
parent 800da1a501
commit 31a00d6647
8 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/krb5/config_file.c
View File

@@ -425,7 +425,7 @@ krb5_config_parse_file_multi (krb5_context context,
* current users home directory. The behavior can be disabled and
* enabled by calling krb5_set_home_dir_access().
*/
if (fname[0] == '~' && fname[1] == '/') {
if (ISTILDE(fname[0]) && ISPATHSEP(fname[1])) {
#ifndef KRB5_USE_PATH_TOKENS
const char *home = NULL;