Attachment #2730 for bug #2480




		return SSH_ERR_INVALID_FORMAT;
}

static int
get_authentication_socket(const char *authsocket, int *fdp)
ssh_get_authentication_socket(int *fdp)
{
	const char *authsocket;
	int sock, oerrno;
	struct sockaddr_un sunaddr;

	if (fdp != NULL)
		*fdp = -1;

	authsocket = getenv(SSH_AUTHSOCKET_ENV_NAME);
	if (!authsocket)
		return SSH_ERR_AGENT_NOT_PRESENT;

	memset(&sunaddr, 0, sizeof(sunaddr));
	sunaddr.sun_family = AF_UNIX;
	strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));

		*fdp = sock;
	else
		close(sock);
	return SSH_ERR_SUCCESS;
}

/* Returns the number of the authentication fd, or -1 if there is none. */
int
ssh_get_authentication_socket(int *fdp)
{
	const char *authsocketlist;
	const char *authsocket;
	int rc;

	if (fdp != NULL)
		*fdp = -1;

	authsocketlist = getenv(SSH_AUTHSOCKET_ENV_NAME);
	if (!authsocketlist)
		return SSH_ERR_AGENT_NOT_PRESENT;

	authsocket = strtok((char *)authsocketlist, ":");

	do {
		rc = get_authentication_socket(authsocket, fdp);
		authsocket = strtok(NULL, ":");
	} while (rc != SSH_ERR_SUCCESS && authsocket != NULL);

	return rc;
}

/* Communicate with agent: send request and read reply */

Lines 171-176 to make this work.) Link Here

(-)a/ssh-add.1 (+2 lines)
171	Identifies the path of a	171	Identifies the path of a
172	.Ux Ns -domain	172	.Ux Ns -domain
173	socket used to communicate with the agent.	173	socket used to communicate with the agent.
		174	If the variable contains a list of sockets separated by colon (:),
		175	the first functional socket will be used.
174	.El	176	.El
175	.Sh FILES	177	.Sh FILES
176	.Bl -tag -width Ds	178	.Bl -tag -width Ds

Lines 1389-1394 to make this work.) Link Here

(-)a/ssh.1 (-1 / +2 lines)
1389	Identifies the path of a	1389	Identifies the path of a
1390	.Ux Ns -domain	1390	.Ux Ns -domain
1391	socket used to communicate with the agent.	1391	socket used to communicate with the agent.
		1392	If the variable contains a list of sockets separated by colon (:),
		1393	the first functional socket will be used.
1392	.It Ev SSH_CONNECTION	1394	.It Ev SSH_CONNECTION
1393	Identifies the client and server ends of the connection.	1395	Identifies the client and server ends of the connection.
1394	The variable contains	1396	The variable contains
1395	-

Return to bug 2480

Lines 83-103 decode_reply(u_char type) Link Here

(-)a/authfd.c (-12 / +28 lines)
83	return SSH_ERR_INVALID_FORMAT;	83	return SSH_ERR_INVALID_FORMAT;
84	}	84	}
85		85
86	/* Returns the number of the authentication fd, or -1 if there is none. */	86	static int
87	int	87	get_authentication_socket(const char authsocket, int fdp)
88	ssh_get_authentication_socket(int *fdp)
89	{	88	{
90	const char *authsocket;
91	int sock, oerrno;	89	int sock, oerrno;
92	struct sockaddr_un sunaddr;	90	struct sockaddr_un sunaddr;
93		91
94	if (fdp != NULL)
95	*fdp = -1;
96
97	authsocket = getenv(SSH_AUTHSOCKET_ENV_NAME);
98	if (!authsocket)
99	return SSH_ERR_AGENT_NOT_PRESENT;
100
101	memset(&sunaddr, 0, sizeof(sunaddr));	92	memset(&sunaddr, 0, sizeof(sunaddr));
102	sunaddr.sun_family = AF_UNIX;	93	sunaddr.sun_family = AF_UNIX;
103	strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));	94	strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
Lines 117-123 ssh_get_authentication_socket(int *fdp) Link Here
117	*fdp = sock;	108	*fdp = sock;
118	else	109	else
119	close(sock);	110	close(sock);
120	return 0;	111	return SSH_ERR_SUCCESS;
		112	}
		113
		114	/* Returns the number of the authentication fd, or -1 if there is none. */
		115	int
		116	ssh_get_authentication_socket(int *fdp)
		117	{
		118	const char *authsocketlist;
		119	const char *authsocket;
		120	int rc;
		121
		122	if (fdp != NULL)
		123	*fdp = -1;
		124
		125	authsocketlist = getenv(SSH_AUTHSOCKET_ENV_NAME);
		126	if (!authsocketlist)
		127	return SSH_ERR_AGENT_NOT_PRESENT;
		128
		129	authsocket = strtok((char *)authsocketlist, ":");
		130
		131	do {
		132	rc = get_authentication_socket(authsocket, fdp);
		133	authsocket = strtok(NULL, ":");
		134	} while (rc != SSH_ERR_SUCCESS && authsocket != NULL);
		135
		136	return rc;
121	}	137	}
122		138
123	/* Communicate with agent: send request and read reply */	139	/* Communicate with agent: send request and read reply */