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

Collapse All | Expand All

(-)a/log.c (-1 / +2 lines)
Lines 429-435 do_log(LogLevel level, const char *fmt, va_list args) Link Here
429 
		break;
 429 
		break;
430 
	}
 430 
	}
431 
	if (txt != NULL && log_handler == NULL) {
 431 
	if (txt != NULL && log_handler == NULL) {
432 
		snprintf(fmtbuf, sizeof(fmtbuf), "%s: %s", txt, fmt);
 432 
		snprintf(fmtbuf, sizeof(fmtbuf), "%s[%ld,%ld]: %s", txt,
433 
		    (long int)time(NULL), monotime(), fmt);
433 
		vsnprintf(msgbuf, sizeof(msgbuf), fmtbuf, args);
 434 
		vsnprintf(msgbuf, sizeof(msgbuf), fmtbuf, args);
434 
	} else {
 435 
	} else {
435 
		vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
 436 
		vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
(-)a/ssh-agent.c (-1 / +7 lines)
Lines 541-549 reaper(void) Link Here
541 
				TAILQ_REMOVE(&tab->idlist, id, next);
 541 
				TAILQ_REMOVE(&tab->idlist, id, next);
542 
				free_identity(id);
 542 
				free_identity(id);
543 
				tab->nentries--;
 543 
				tab->nentries--;
544 
			} else
 544 
			} else {
545 
				debug3("key '%s' death time %ld", id->comment,
546 
				    id->death);
545 
				deadline = (deadline == 0) ? id->death :
 547 
				deadline = (deadline == 0) ? id->death :
546 
				    MIN(deadline, id->death);
 548 
				    MIN(deadline, id->death);
549 
			}
547 
		}
 550 
		}
548 
	}
 551 
	}
549 
	if (deadline == 0 || deadline <= now)
 552 
	if (deadline == 0 || deadline <= now)
Lines 638-643 process_add_identity(SocketEntry *e, int version) Link Here
638 
				goto err;
 641 
				goto err;
639 
			}
 642 
			}
640 
			death = monotime() + seconds;
 643 
			death = monotime() + seconds;
644 
			debug3("constrain lifetime key '%s' seconds %u "
645 
			    "death time %ld", comment, seconds, death);
641 
			break;
 646 
			break;
642 
		case SSH_AGENT_CONSTRAIN_CONFIRM:
 647 
		case SSH_AGENT_CONSTRAIN_CONFIRM:
643 
			confirm = 1;
 648 
			confirm = 1;
Lines 1031-1036 prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl, u_int *nallocp, Link Here
1031 
		}
 1036 
		}
1032 
	}
 1037 
	}
1033 
	deadline = reaper();
 1038 
	deadline = reaper();
1039 
	debug3("reaper deadline %ld", (long int)deadline);
1034 
	if (parent_alive_interval != 0)
 1040 
	if (parent_alive_interval != 0)
1035 
		deadline = (deadline == 0) ? parent_alive_interval :
 1041 
		deadline = (deadline == 0) ? parent_alive_interval :
1036 
		    MIN(deadline, parent_alive_interval);
 1042 
		    MIN(deadline, parent_alive_interval);

Return to bug 2598