upstream commit
g/c unused variable; make a little more portable Upstream-ID: 3f5980481551cb823c6fb2858900f93fa9217dea
This commit is contained in:
parent
51676ec614
commit
9f0e44e1a0
|
@ -1,4 +1,4 @@
|
||||||
/* $OpenBSD: ssh-agent.c,v 1.223 2017/07/19 01:15:02 djm Exp $ */
|
/* $OpenBSD: ssh-agent.c,v 1.224 2017/07/24 04:34:28 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
|
||||||
|
@ -949,7 +949,7 @@ prepare_poll(struct pollfd **pfdp, size_t *npfdp, int *timeoutp)
|
||||||
deadline = (deadline == 0) ? parent_alive_interval :
|
deadline = (deadline == 0) ? parent_alive_interval :
|
||||||
MINIMUM(deadline, parent_alive_interval);
|
MINIMUM(deadline, parent_alive_interval);
|
||||||
if (deadline == 0) {
|
if (deadline == 0) {
|
||||||
*timeoutp = INFTIM;
|
*timeoutp = -1; /* INFTIM */
|
||||||
} else {
|
} else {
|
||||||
if (deadline > INT_MAX / 1000)
|
if (deadline > INT_MAX / 1000)
|
||||||
*timeoutp = INT_MAX / 1000;
|
*timeoutp = INT_MAX / 1000;
|
||||||
|
@ -1018,7 +1018,6 @@ main(int ac, char **av)
|
||||||
{
|
{
|
||||||
int c_flag = 0, d_flag = 0, D_flag = 0, k_flag = 0, s_flag = 0;
|
int c_flag = 0, d_flag = 0, D_flag = 0, k_flag = 0, s_flag = 0;
|
||||||
int sock, fd, ch, result, saved_errno;
|
int sock, fd, ch, result, saved_errno;
|
||||||
u_int nalloc;
|
|
||||||
char *shell, *format, *pidstr, *agentsocket = NULL;
|
char *shell, *format, *pidstr, *agentsocket = NULL;
|
||||||
#ifdef HAVE_SETRLIMIT
|
#ifdef HAVE_SETRLIMIT
|
||||||
struct rlimit rlim;
|
struct rlimit rlim;
|
||||||
|
@ -1029,7 +1028,7 @@ main(int ac, char **av)
|
||||||
char pidstrbuf[1 + 3 * sizeof pid];
|
char pidstrbuf[1 + 3 * sizeof pid];
|
||||||
size_t len;
|
size_t len;
|
||||||
mode_t prev_mask;
|
mode_t prev_mask;
|
||||||
int timeout = INFTIM;
|
int timeout = -1; /* INFTIM */
|
||||||
struct pollfd *pfd = NULL;
|
struct pollfd *pfd = NULL;
|
||||||
size_t npfd = 0;
|
size_t npfd = 0;
|
||||||
|
|
||||||
|
@ -1252,7 +1251,6 @@ skip:
|
||||||
signal(SIGINT, (d_flag | D_flag) ? cleanup_handler : SIG_IGN);
|
signal(SIGINT, (d_flag | D_flag) ? cleanup_handler : SIG_IGN);
|
||||||
signal(SIGHUP, cleanup_handler);
|
signal(SIGHUP, cleanup_handler);
|
||||||
signal(SIGTERM, cleanup_handler);
|
signal(SIGTERM, cleanup_handler);
|
||||||
nalloc = 0;
|
|
||||||
|
|
||||||
if (pledge("stdio rpath cpath unix id proc exec", NULL) == -1)
|
if (pledge("stdio rpath cpath unix id proc exec", NULL) == -1)
|
||||||
fatal("%s: pledge: %s", __progname, strerror(errno));
|
fatal("%s: pledge: %s", __progname, strerror(errno));
|
||||||
|
|
Loading…
Reference in New Issue