From 2f6d723e1f0858469794ee92cbe9e4445a7276cf Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 8 Sep 2006 04:36:41 +0000 Subject: r18249: Keep trying to start an GENSEC mech from the list until one actually starts. Andrew Bartlett (This used to be commit 7dba525f5598199e89badbf15e0f5f09023c6cfa) --- source4/auth/gensec/gensec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'source4') diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c index 84d198cb7b..c4b1e2494a 100644 --- a/source4/auth/gensec/gensec.c +++ b/source4/auth/gensec/gensec.c @@ -727,11 +727,12 @@ NTSTATUS gensec_start_mech_by_sasl_name(struct gensec_security *gensec_security, */ _PUBLIC_ NTSTATUS gensec_start_mech_by_sasl_list(struct gensec_security *gensec_security, - const char **sasl_names) + const char **sasl_names) { NTSTATUS nt_status; TALLOC_CTX *mem_ctx = talloc_new(gensec_security); const struct gensec_security_ops **ops; + int i; if (!mem_ctx) { return NT_STATUS_NO_MEMORY; } @@ -743,7 +744,12 @@ _PUBLIC_ NTSTATUS gensec_start_mech_by_sasl_list(struct gensec_security *gensec_ talloc_free(mem_ctx); return NT_STATUS_INVALID_PARAMETER; } - nt_status = gensec_start_mech_by_ops(gensec_security, ops[0]); + for (i=0; ops[i]; i++) { + nt_status = gensec_start_mech_by_ops(gensec_security, ops[i]); + if (!NT_STATUS_EQUAL(nt_status, NT_STATUS_INVALID_PARAMETER)) { + break; + } + } talloc_free(mem_ctx); return nt_status; } -- cgit