Expand path tokens for krb5.moduli

2010-12-03 17:42:42 -05:00
parent e4d2d78a21
commit b45dd13c44
1 changed files with 14 additions and 0 deletions
--- a/lib/krb5/pkinit.c
+++ b/lib/krb5/pkinit.c
@@ -2214,7 +2214,21 @@ _krb5_parse_moduli(krb5_context context, const char *file,
    if (file == NULL)
 	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");
+#endif
+
    if (f == NULL) {
 	*moduli = m;
 	return 0;