From: mouring <mouring>
Date: Thu, 17 May 2001 03:17:55 +0000 (+0000)
Subject:    - markus@cvs.openbsd.org 2001/05/16 20:51:57
X-Git-Tag: V_2_9_9_P1~368
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/70ea83278bc804959631156f0a4a098a5e9f161a

   - markus@cvs.openbsd.org 2001/05/16 20:51:57
     [authfile.c]
     return comments for private pem files, too; report from nolan@naic.edu
---

diff --git a/ChangeLog b/ChangeLog
index 62d9e0d3..4d90cd3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
    - deraadt@cvs.openbsd.org 2001/05/15 22:04:01
      [ssh.1]
      X11 forwarding details improved
+   - markus@cvs.openbsd.org 2001/05/16 20:51:57
+     [authfile.c]
+     return comments for private pem files, too; report from nolan@naic.edu
 
 20010512
  - OpenBSD CVS Sync
diff --git a/authfile.c b/authfile.c
index 8234ba07..2715bdef 100644
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfile.c,v 1.32 2001/04/18 23:44:51 markus Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.33 2001/05/16 20:51:57 markus Exp $");
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
@@ -558,7 +558,8 @@ key_load_private(const char *filename, const char *passphrase,
 	lseek(fd, (off_t) 0, SEEK_SET);		/* rewind */
 	if (pub == NULL) {
 		/* closes fd */
-		return key_load_private_pem(fd, KEY_UNSPEC, passphrase, NULL);
+		return key_load_private_pem(fd, KEY_UNSPEC, passphrase,
+		    commentp);
 	} else {
 		/* it's a SSH v1 key if the public key part is readable */
 		key_free(pub);