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

Expand path tokens for krb5.moduli

Browse Source
This commit is contained in:
Asanka C. Herath
2010-12-03 17:42:42 -05:00
parent e4d2d78a21
commit b45dd13c44
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/krb5/pkinit.c
View File

@@ -2214,7 +2214,21 @@ _krb5_parse_moduli(krb5_context context, const char *file,
if (file == NULL) if (file == NULL)
file = MODULI_FILE; file = MODULI_FILE;
#ifdef KRB5_USE_PATH_TOKENS
{
char * exp_file;
if (_krb5_expand_path_tokens(context, file, &exp_file) == 0) {
f = fopen(exp_file, "r");
krb5_xfree(exp_file);
} else {
f = NULL;
}
}
#else
f = fopen(file, "r"); f = fopen(file, "r");
#endif
if (f == NULL) { if (f == NULL) {
*moduli = m; *moduli = m;
return 0; return 0;