View | Details | Raw Unified | Return to bug 2236
Collapse All | Expand All

(-)a/ssh-agent.c (-1 / +7 lines)
Lines 124-129 int max_fd = 0; Link Here
124
pid_t parent_pid = -1;
124
pid_t parent_pid = -1;
125
time_t parent_alive_interval = 0;
125
time_t parent_alive_interval = 0;
126
126
127
/* pid of process for which cleanup_socket is applicable */
128
pid_t cleanup_pid = -1;
129
127
/* pathname and directory for AUTH_SOCKET */
130
/* pathname and directory for AUTH_SOCKET */
128
char socket_name[MAXPATHLEN];
131
char socket_name[MAXPATHLEN];
129
char socket_dir[MAXPATHLEN];
132
char socket_dir[MAXPATHLEN];
Lines 960-965 after_select(fd_set *readset, fd_set *writeset) Link Here
960
static void
963
static void
961
cleanup_socket(void)
964
cleanup_socket(void)
962
{
965
{
966
	if (cleanup_pid != -1 && getpid() != cleanup_pid)
967
		return;
963
	if (socket_name[0])
968
	if (socket_name[0])
964
		unlink(socket_name);
969
		unlink(socket_name);
965
	if (socket_dir[0])
970
	if (socket_dir[0])
Lines 1226-1231 main(int ac, char **av) Link Here
1226
1231
1227
skip:
1232
skip:
1228
1233
1234
	cleanup_pid = getpid();
1235
1229
#ifdef ENABLE_PKCS11
1236
#ifdef ENABLE_PKCS11
1230
	pkcs11_init(0);
1237
	pkcs11_init(0);
1231
#endif
1238
#endif
1232
- 

Return to bug 2236