View | Details | Raw Unified | Return to bug 1067 | Differences between
and this patch

Collapse All | Expand All

(-)ssh-keyscan.c (-6 / +12 lines)
Lines 490-501 congreet(int s) Link Here
490
	size_t bufsiz;
491
	size_t bufsiz;
491
	con *c = &fdcon[s];
492
	con *c = &fdcon[s];
492
493
493
	bufsiz = sizeof(buf);
494
	for (;;) {
494
	cp = buf;
495
		memset(buf, '\0', sizeof(buf));
495
	while (bufsiz-- && (n = atomicio(read, s, cp, 1)) == 1 && *cp != '\n') {
496
		bufsiz = sizeof(buf);
496
		if (*cp == '\r')
497
		cp = buf;
497
			*cp = '\n';
498
		while (bufsiz-- &&
498
		cp++;
499
		    (n = atomicio(read, s, cp, 1)) == 1 && *cp != '\n') {
500
			if (*cp == '\r')
501
				*cp = '\n';
502
			cp++;
503
		}
504
		if (strncmp(buf, "SSH-", 4) == 0)
505
			break;
499
	}
506
	}
500
	if (n == 0) {
507
	if (n == 0) {
501
		switch (errno) {
508
		switch (errno) {

Return to bug 1067