diff options
author | Damien Miller <djm@mindrot.org> | 2015-03-03 13:48:48 -0800 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-03-03 13:48:48 -0800 |
commit | 6c2039286f503e2012a58a1d109e389016e7a99b (patch) | |
tree | 013b71a77321df285ef5f030f91202cd34f2a78a | |
parent | 111dfb225478a76f89ecbcd31e96eaf1311b59d3 (diff) |
fix merge both that broke --without-ssh1 compile
-rw-r--r-- | ssh-agent.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index cff859ff5..492410527 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -536,7 +536,6 @@ reaper(void) | |||
536 | return (deadline - now); | 536 | return (deadline - now); |
537 | } | 537 | } |
538 | 538 | ||
539 | #ifdef WITH_SSH1 | ||
540 | /* | 539 | /* |
541 | * XXX this and the corresponding serialisation function probably belongs | 540 | * XXX this and the corresponding serialisation function probably belongs |
542 | * in key.c | 541 | * in key.c |
@@ -579,7 +578,7 @@ agent_decode_rsa1(struct sshbuf *m, struct sshkey **kp) | |||
579 | sshkey_free(k); | 578 | sshkey_free(k); |
580 | return r; | 579 | return r; |
581 | } | 580 | } |
582 | #endif | 581 | #endif /* WITH_SSH1 */ |
583 | 582 | ||
584 | static void | 583 | static void |
585 | process_add_identity(SocketEntry *e, int version) | 584 | process_add_identity(SocketEntry *e, int version) |
@@ -656,7 +655,6 @@ process_add_identity(SocketEntry *e, int version) | |||
656 | send: | 655 | send: |
657 | send_status(e, success); | 656 | send_status(e, success); |
658 | } | 657 | } |
659 | #endif /* WITH_SSH1 */ | ||
660 | 658 | ||
661 | /* XXX todo: encrypt sensitive data with passphrase */ | 659 | /* XXX todo: encrypt sensitive data with passphrase */ |
662 | static void | 660 | static void |