diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2011-05-23 07:24:58 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2011-05-23 07:24:58 +0000 |
| commit | ddd1db6a835b15ce62e117a299bf57a443911f2f (patch) | |
| tree | 52e9c8dd03c8c28d24a85790e99df6c0d19cfa39 /usr.bin | |
| parent | f1efbf74fd993e74a4928aadde609543ca736795 (diff) | |
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@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/authfile.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c index be7efd4d5a4..325a8e25005 100644 --- a/usr.bin/ssh/authfile.c +++ b/usr.bin/ssh/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 <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -758,8 +758,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; } |