summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-11-21 23:48:55 +1100
committerDamien Miller <djm@mindrot.org>2003-11-21 23:48:55 +1100
commita8e06cef35c205e1aa562513c6d034a10c8c9a6d (patch)
treecf8bdb4466f553088c020b9179cabd6eaf196075 /sshconnect2.c
parent8c5e91c03fdd2693f0635f8b2a9904bffc94ce16 (diff)
- djm@cvs.openbsd.org 2003/11/21 11:57:03
[everything] unexpand and delete whitespace at EOL; ok markus@ (done locally and RCS IDs synced)
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index f6368aadd..76670e8a8 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.132 2003/11/17 11:06:07 markus Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.133 2003/11/21 11:57:03 djm Exp $");
27 27
28#include "openbsd-compat/sys-queue.h" 28#include "openbsd-compat/sys-queue.h"
29 29
@@ -476,7 +476,7 @@ done:
476} 476}
477 477
478#ifdef GSSAPI 478#ifdef GSSAPI
479int 479int
480userauth_gssapi(Authctxt *authctxt) 480userauth_gssapi(Authctxt *authctxt)
481{ 481{
482 Gssctxt *gssctxt = NULL; 482 Gssctxt *gssctxt = NULL;
@@ -584,7 +584,7 @@ process_gssapi_token(void *ctxt, gss_buffer_t recv_tok)
584 584
585 buffer_free(&b); 585 buffer_free(&b);
586 gss_release_buffer(&ms, &mic); 586 gss_release_buffer(&ms, &mic);
587 } 587 }
588 } 588 }
589 589
590 return status; 590 return status;
@@ -1033,7 +1033,7 @@ pubkey_prepare(Authctxt *authctxt)
1033 key = ssh_get_next_identity(ac, &comment, 2)) { 1033 key = ssh_get_next_identity(ac, &comment, 2)) {
1034 found = 0; 1034 found = 0;
1035 TAILQ_FOREACH(id, &files, next) { 1035 TAILQ_FOREACH(id, &files, next) {
1036 /* agent keys from the config file are preferred */ 1036 /* agent keys from the config file are preferred */
1037 if (key_equal(key, id->key)) { 1037 if (key_equal(key, id->key)) {
1038 key_free(key); 1038 key_free(key);
1039 xfree(comment); 1039 xfree(comment);