Mailing List Archive

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 6c2039286f503e2012a58a1d109e389016e7a99b
Author: Damien Miller <djm@mindrot.org>
Date: Tue Mar 3 13:48:48 2015 -0800

fix merge both that broke --without-ssh1 compile
---
ssh-agent.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ssh-agent.c b/ssh-agent.c
index cff859f..4924105 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -536,7 +536,6 @@ reaper(void)
return (deadline - now);
}

-#ifdef WITH_SSH1
/*
* XXX this and the corresponding serialisation function probably belongs
* in key.c
@@ -579,7 +578,7 @@ agent_decode_rsa1(struct sshbuf *m, struct sshkey **kp)
sshkey_free(k);
return r;
}
-#endif
+#endif /* WITH_SSH1 */

static void
process_add_identity(SocketEntry *e, int version)
@@ -656,7 +655,6 @@ process_add_identity(SocketEntry *e, int version)
send:
send_status(e, success);
}
-#endif /* WITH_SSH1 */

/* XXX todo: encrypt sensitive data with passphrase */
static void

--
To stop receiving notification emails like this one, please contact
djm@mindrot.org.
_______________________________________________
openssh-commits mailing list
openssh-commits@mindrot.org
https://lists.mindrot.org/mailman/listinfo/openssh-commits