From f9984d1114fc8b8e3401190d334cb3af2c9849b4 Mon Sep 17 00:00:00 2001
From: mdw <mdw>
Date: Fri, 17 Oct 2003 16:30:46 +0000
Subject: [PATCH] Report errors if key files don't exist!

---
 Makefile.m4 |  7 +++++--
 key-io.c    | 10 +++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile.m4 b/Makefile.m4
index 379c9be..c0b3ba3 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
-## -*-makefile-*-
+## -*-m4-*-
 ##
-## $Id: Makefile.m4,v 1.62 2003/10/12 15:02:09 mdw Exp $
+## $Id: Makefile.m4,v 1.63 2003/10/17 16:30:46 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.63  2003/10/17 16:30:46  mdw
+## Report errors if key files don't exist!
+##
 ## Revision 1.62  2003/10/12 15:02:09  mdw
 ## Reliability fixes.
 ##
diff --git a/key-io.c b/key-io.c
index dbe8bdf..a2d1c91 100644
--- a/key-io.c
+++ b/key-io.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: key-io.c,v 1.4 2001/02/03 11:57:38 mdw Exp $
+ * $Id: key-io.c,v 1.5 2003/10/17 16:30:46 mdw Exp $
  *
  * Adding new keys to a key file
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: key-io.c,v $
+ * Revision 1.5  2003/10/17 16:30:46  mdw
+ * Report errors if key files don't exist!
+ *
  * Revision 1.4  2001/02/03 11:57:38  mdw
  * Allow creating keyfiles with no file attached.
  *
@@ -440,9 +443,10 @@ int key_extract(key_file *f, key *k, FILE *fp, const key_filter *kf)
 int key_open(key_file *f, const char *file, unsigned how,
 	     key_reporter *rep, void *arg)
 {
-  if (key_lockfile(f, file, how))
+  if (key_lockfile(f, file, how)) {
+    rep(file, 0, strerror(errno), arg);
     return (-1);
-
+  }
   f->f = 0;
   f->name = xstrdup(file);
 
-- 
2.11.0