X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=privcache.c;h=81b04fcc65f456e3585001fd7425236b37d66ba5;hb=e9e9ed30411fc816f91b9f53223d8d5247ed520e;hp=50da4b5a5611950b637432ba1fc1964aedf83ca8;hpb=c52b7f938b6bd42d73f557b8b07ac9d751add3be;p=secnet.git

diff --git a/privcache.c b/privcache.c
index 50da4b5..81b04fc 100644
--- a/privcache.c
+++ b/privcache.c
@@ -48,10 +48,10 @@ static struct sigprivkey_if *uncached_get(struct privcache *st,
     f = fopen(st->path.buffer,"rb");
     if (!f) {
 	if (errno == ENOENT) {
-	    slilog(log,M_DEBUG,"private key %s not found\n",
-		   st->path.write_here);
+	    slilog(log,M_DEBUG,"private key %s not found",
+		   st->path.buffer);
 	} else {
-	    slilog(log,M_ERR,"failed to open private key file %s\n",
+	    slilog(log,M_ERR,"failed to open private key file %s",
 		   st->path.buffer);
 	}
 	goto out;
@@ -61,12 +61,12 @@ static struct sigprivkey_if *uncached_get(struct privcache *st,
     buffer_init(&st->databuf,0);
     ssize_t got=fread(st->databuf.base,1,st->databuf.alloclen,f);
     if (ferror(f)) {
-	slilog(log,M_ERR,"failed to read private-key file %s\n",
+	slilog(log,M_ERR,"failed to read private-key file %s",
 	       st->path.buffer);
 	goto out;
     }
     if (!feof(f)) {
-	slilog(log,M_ERR,"private key file %s longer than max %d\n",
+	slilog(log,M_ERR,"private key file %s longer than max %d",
 	       st->path.buffer, (int)st->databuf.alloclen);
 	goto out;
     }
@@ -78,7 +78,8 @@ static struct sigprivkey_if *uncached_get(struct privcache *st,
 	 scheme++) {
 	st->databuf.start=st->databuf.base;
 	st->databuf.size=got;
-	ok=scheme->loadpriv(scheme, &st->databuf, &sigpriv, log);
+	struct cloc loc = { .file=st->path.buffer, .line=0 };
+	ok=scheme->loadpriv(scheme, &st->databuf, &sigpriv, log, loc);
 	if (ok) {
 	    if (sigpriv->sethash) {
 		if (!st->defhash) {
@@ -95,7 +96,7 @@ static struct sigprivkey_if *uncached_get(struct privcache *st,
 	}
     }
 
-    slilog(log,M_ERR,"private key file %s not loaded (not recognised?)\n",
+    slilog(log,M_ERR,"private key file %s not loaded (not recognised?)",
 	   st->path.buffer);
 
   out: