From 04bb56ef10bca3219010fdb191f1f9941353174b Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 29 May 2011 21:42:08 +1000 Subject: - djm@cvs.openbsd.org 2011/05/23 07:24:57 [authfile.c] read in key comments for v.2 keys (though note that these are not passed over the agent protocol); bz#439, based on patch from binder AT arago.de; ok markus@ --- authfile.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'authfile.c') diff --git a/authfile.c b/authfile.c index 734d657e..96d2bf33 100644 --- a/authfile.c +++ b/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.90 2011/05/13 00:05:36 djm Exp $ */ +/* $OpenBSD: authfile.c,v 1.91 2011/05/23 07:24:57 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -774,8 +774,11 @@ key_try_load_public(Key *k, const char *filename, char **commentp) ; if (*cp) { if (key_read(k, &cp) == 1) { - if (commentp) - *commentp=xstrdup(filename); + cp[strcspn(cp, "\r\n")] = '\0'; + if (commentp) { + *commentp = xstrdup(*cp ? + cp : filename); + } fclose(f); return 1; } -- cgit v1.2.3