Bugzilla – Attachment 986 Details for
Bug 1067
ssh-keyscan does not work with F-Secure SSH 3.2.0 sometimes
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Better patch
ssh-keyscan-ignore-leading-junk2.diff (text/plain), 843 bytes, created by
Damien Miller
on 2005-10-11 19:55:12 AEST
(
hide
)
Description:
Better patch
Filename:
MIME Type:
Creator:
Damien Miller
Created:
2005-10-11 19:55:12 AEST
Size:
843 bytes
patch
obsolete
>Index: ssh-keyscan.c >=================================================================== >RCS file: /cvs/src/usr.bin/ssh/ssh-keyscan.c,v >retrieving revision 1.56 >diff -u -p -r1.56 ssh-keyscan.c >--- ssh-keyscan.c 13 Sep 2005 23:40:07 -0000 1.56 >+++ ssh-keyscan.c 11 Oct 2005 09:53:18 -0000 >@@ -490,12 +491,18 @@ congreet(int s) > size_t bufsiz; > con *c = &fdcon[s]; > >- bufsiz = sizeof(buf); >- cp = buf; >- while (bufsiz-- && (n = atomicio(read, s, cp, 1)) == 1 && *cp != '\n') { >- if (*cp == '\r') >- *cp = '\n'; >- cp++; >+ for (;;) { >+ memset(buf, '\0', sizeof(buf)); >+ bufsiz = sizeof(buf); >+ cp = buf; >+ while (bufsiz-- && >+ (n = atomicio(read, s, cp, 1)) == 1 && *cp != '\n') { >+ if (*cp == '\r') >+ *cp = '\n'; >+ cp++; >+ } >+ if (n != 1 || strncmp(buf, "SSH-", 4) == 0) >+ break; > } > if (n == 0) { > switch (errno) {
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=986">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1067
:
985
| 986