Attachment #3249 for bug #2975

View | Details | Raw Unified | Return to bug 2975
Collapse All | Expand All




               return (0);
       }

       if (!authctxt->valid || authctxt->user == NULL) {
               debug2("%s: disabled because of invalid user", __func__);
               free(doid);
               return (0);
       }

       if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {
               if (ctxt != NULL)
                       ssh_gssapi_delete_ctx(&ctxt);

Lines 268-273 input_userauth_request(int type, u_int32_t seq, struct ssh *ssh) Link Here

(-)a/auth2.c (+3 lines)
268	char user = NULL, service = NULL, method = NULL, style = NULL;	268	char user = NULL, service = NULL, method = NULL, style = NULL;
269	int r, authenticated = 0;	269	int r, authenticated = 0;
270	double tstart = monotime_double();	270	double tstart = monotime_double();
		271	int was_postponed = authctxt->postponed;
271		272
272	if (authctxt == NULL)	273	if (authctxt == NULL)
273	fatal("input_userauth_request: no authctxt");	274	fatal("input_userauth_request: no authctxt");
Lines 337-342 input_userauth_request(int type, u_int32_t seq, struct ssh *ssh) Link Here
337	if (m != NULL && authctxt->failures < options.max_authtries) {	338	if (m != NULL && authctxt->failures < options.max_authtries) {
338	debug2("input_userauth_request: try method %s", method);	339	debug2("input_userauth_request: try method %s", method);
339	authenticated = m->userauth(ssh);	340	authenticated = m->userauth(ssh);
		341	if (!authenticated && was_postponed)
		342	authctxt->failures++;
340	}	343	}
341	if (!authctxt->authenticated)	344	if (!authctxt->authenticated)
342	ensure_minimum_time_since(tstart,	345	ensure_minimum_time_since(tstart,

Return to bug 2975

Lines 103-114 userauth_gssapi(struct ssh *ssh) Link Here

(-)a/auth2-gss.c (-6 lines)
103	return (0);	103	return (0);
104	}	104	}
105		105
106	if (!authctxt->valid \|\| authctxt->user == NULL) {
107	debug2("%s: disabled because of invalid user", __func__);
108	free(doid);
109	return (0);
110	}
111
112	if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {	106	if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {
113	if (ctxt != NULL)	107	if (ctxt != NULL)
114	ssh_gssapi_delete_ctx(&ctxt);	108	ssh_gssapi_delete_ctx(&ctxt);