Attachment 3190 Details for Bug 2913 – tweaked patch; avoid -Wsign-compare problem

[patch] tweaked patch; avoid -Wsign-compare problem

bz2912.diff (text/plain), 1.12 KB, created by Damien Miller on 2018-10-09 17:25:15 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2018-10-09 17:25:15 AEDT

Size: 1.12 KB

patch

obsolete

>diff --git a/sshconnect2.c b/sshconnect2.c
>index 86a0254b..39b427c1 100644
>--- a/sshconnect2.c
>+++ b/sshconnect2.c
>@@ -379,7 +379,6 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
> 
> 	/* setup authentication context */
> 	memset(&authctxt, 0, sizeof(authctxt));
>-	pubkey_prepare(&authctxt);
> 	authctxt.server_user = server_user;
> 	authctxt.local_user = local_user;
> 	authctxt.host = host;
>@@ -392,6 +391,7 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
> 	authctxt.active_ktype = authctxt.oktypes = authctxt.ktypes = NULL;
> 	authctxt.info_req_seen = 0;
> 	authctxt.agent_fd = -1;
>+	pubkey_prepare(&authctxt);
> 	if (authctxt.method == NULL)
> 		fatal("ssh_userauth2: internal error: cannot send userauth none request");
> 
>@@ -1619,8 +1619,10 @@ pubkey_cleanup(Authctxt *authctxt)
> {
> 	Identity *id;
> 
>-	if (authctxt->agent_fd != -1)
>+	if (authctxt->agent_fd != -1) {
> 		ssh_close_authentication_socket(authctxt->agent_fd);
>+		authctxt->agent_fd = -1;
>+	}
> 	for (id = TAILQ_FIRST(&authctxt->keys); id;
> 	    id = TAILQ_FIRST(&authctxt->keys)) {
> 		TAILQ_REMOVE(&authctxt->keys, id, next);

Actions: View | Diff

Attachments on bug 2913: 3183 | 3184 | 3190 | 3192