# 
# 
# patch "ChangeLog"
#  from [994e5c7216b572e797fb67652eecc6c3cfde7d09]
#    to [e866030d594ec1d1b390767c9b939cc7bc5478d9]
# 
# patch "cert.cc"
#  from [c02a7b0abf62fa3d0485985df5317154041025cf]
#    to [289ab8fc2d5c2622d3f563bd57a37442efbb52b8]
# 
# patch "keys.cc"
#  from [6a9950c8f9a3d70c82ee7f9519be3f1679afbcdb]
#    to [f3cf085b551faae43daa06fd8cd9b307bcde462f]
# 
============================================================
--- ChangeLog	994e5c7216b572e797fb67652eecc6c3cfde7d09
+++ ChangeLog	e866030d594ec1d1b390767c9b939cc7bc5478d9
@@ -1,3 +1,9 @@
+2006-01-15  Nathaniel Smith  <address@hidden>
+
+	* cert.cc (load_key_pair): 
+	* keys.cc (require_password): Use accessor method, so as to
+	actually compile...
+
 2006-01-14  Nathaniel Smith  <address@hidden>
 
 	* lua.cc (hook_get_key_pair): Remove.
============================================================
--- cert.cc	c02a7b0abf62fa3d0485985df5317154041025cf
+++ cert.cc	289ab8fc2d5c2622d3f563bd57a37442efbb52b8
@@ -344,7 +344,8 @@
   else
     {
       N(app.keys.key_pair_exists(id),
-        F("no key pair '%s' found in key store '%s'") % id % app.keys.key_dir);
+        F("no key pair '%s' found in key store '%s'")
+        % id % app.keys.get_key_dir());
       app.keys.get_key_pair(id, kp);
       if (persist_ok)
         keys.insert(make_pair(id, kp));
============================================================
--- keys.cc	6a9950c8f9a3d70c82ee7f9519be3f1679afbcdb
+++ keys.cc	f3cf085b551faae43daa06fd8cd9b307bcde462f
@@ -529,7 +529,7 @@
 {
   N(priv_key_exists(app, key),
     F("no key pair '%s' found in key store '%s'")
-    % key % app.keys.key_dir);
+    % key % app.keys.get_key_dir());
   keypair kp;
   load_key_pair(app, key, kp);
   if (app.lua.hook_persist_phrase_ok())