From d0be7909f2a64d2b63bfa658221fd1d0f76e91a6 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 9 Nov 2009 21:30:03 -0800
Subject: [PATCH] auth: make ~ in keyring search path subst in $HOME

---
 src/auth/KeyRing.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/auth/KeyRing.cc b/src/auth/KeyRing.cc
index b0090b1b0a699..ba06efc55b127 100644
--- a/src/auth/KeyRing.cc
+++ b/src/auth/KeyRing.cc
@@ -38,6 +38,11 @@ bool KeyRing::load_master(const char *filename_list)
   get_str_list(k, ls);
   int fd = -1;
   for (list<string>::iterator p = ls.begin(); p != ls.end(); p++) {
+    // subst in home dir?
+    size_t pos = p->find("~/");
+    if (pos != string::npos)
+      p->replace(pos, 1, getenv("HOME"));
+
     fd = open(p->c_str(), O_RDONLY);
     if (fd >= 0) {
       filename = *p;
-- 
2.39.5