From b45dd13c44ccd62f7a201ff872748ccd2067be08 Mon Sep 17 00:00:00 2001
From: "Asanka C. Herath" <asanka@secure-endpoints.com>
Date: Fri, 3 Dec 2010 17:42:42 -0500
Subject: [PATCH] Expand path tokens for krb5.moduli

---
 lib/krb5/pkinit.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/krb5/pkinit.c b/lib/krb5/pkinit.c
index 1bf922baf..7a8502727 100644
--- 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;