tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 00:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2011/05/23 07:24:57

Browse Source 
[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@
This commit is contained in:
Damien Miller 2011-05-29 21:42:08 +10:00
parent b9132fc427
commit 04bb56ef10
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -19,6 +19,11 @@
- jmc@cvs.openbsd.org 2011/05/23 07:10:21 - jmc@cvs.openbsd.org 2011/05/23 07:10:21
[sshd.8 sshd_config.5] [sshd.8 sshd_config.5]
tweak previous; ok djm tweak previous; ok djm
- 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@
20110520 20110520
- (djm) [session.c] call setexeccon() before executing passwd for pw - (djm) [session.c] call setexeccon() before executing passwd for pw

9
authfile.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -774,8 +774,11 @@ key_try_load_public(Key *k, const char *filename, char **commentp)
; ;
if (*cp) { if (*cp) {
if (key_read(k, &cp) == 1) { if (key_read(k, &cp) == 1) {
if (commentp) cp[strcspn(cp, "\r\n")] = '\0';
*commentp=xstrdup(filename); if (commentp) {
*commentp = xstrdup(*cp ?
cp : filename);
}
fclose(f); fclose(f);
return 1; return 1;
} }