Deleted Added
full compact
auth2-gss.c (225736) auth2-gss.c (247485)
1/* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */
1/* $OpenBSD: auth2-gss.c,v 1.17 2011/03/10 02:52:57 djm Exp $ */
2
3/*
4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright

--- 87 unchanged lines hidden (view full) ---

97 logit("Badly formed OID received");
98 }
99 } while (mechs > 0 && !present);
100
101 gss_release_oid_set(&ms, &supported);
102
103 if (!present) {
104 xfree(doid);
2
3/*
4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright

--- 87 unchanged lines hidden (view full) ---

97 logit("Badly formed OID received");
98 }
99 } while (mechs > 0 && !present);
100
101 gss_release_oid_set(&ms, &supported);
102
103 if (!present) {
104 xfree(doid);
105 authctxt->server_caused_failure = 1;
105 return (0);
106 }
107
108 if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {
109 if (ctxt != NULL)
110 ssh_gssapi_delete_ctx(&ctxt);
111 xfree(doid);
106 return (0);
107 }
108
109 if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {
110 if (ctxt != NULL)
111 ssh_gssapi_delete_ctx(&ctxt);
112 xfree(doid);
113 authctxt->server_caused_failure = 1;
112 return (0);
113 }
114
115 authctxt->methoddata = (void *)ctxt;
116
117 packet_start(SSH2_MSG_USERAUTH_GSSAPI_RESPONSE);
118
119 /* Return the OID that we received */

--- 182 unchanged lines hidden ---
114 return (0);
115 }
116
117 authctxt->methoddata = (void *)ctxt;
118
119 packet_start(SSH2_MSG_USERAUTH_GSSAPI_RESPONSE);
120
121 /* Return the OID that we received */

--- 182 unchanged lines hidden ---