Author: abartlet Date: 2006-09-08 05:24:44 +0000 (Fri, 08 Sep 2006) New Revision: 18253
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18253 Log: Turn Cyrus-SASL DIGEST-MD5 off by default for now. Andrew Bartlett Modified: branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c branches/SAMBA_4_0/source/auth/gensec/gensec.c Changeset: Modified: branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c =================================================================== --- branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c 2006-09-08 05:10:10 UTC (rev 18252) +++ branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c 2006-09-08 05:24:44 UTC (rev 18253) @@ -308,7 +308,7 @@ .wrap_packets = gensec_sasl_wrap_packets, .unwrap_packets = gensec_sasl_unwrap_packets, .have_feature = gensec_sasl_have_feature, - .enabled = True, + .enabled = False, .order = GENSEC_SASL }; Modified: branches/SAMBA_4_0/source/auth/gensec/gensec.c =================================================================== --- branches/SAMBA_4_0/source/auth/gensec/gensec.c 2006-09-08 05:10:10 UTC (rev 18252) +++ branches/SAMBA_4_0/source/auth/gensec/gensec.c 2006-09-08 05:24:44 UTC (rev 18253) @@ -1245,6 +1245,13 @@ return &critical_sizes; } +static int sort_gensec(struct gensec_security_ops **gs1, struct gensec_security_ops **gs2) { + SMB_ASSERT(talloc_get_type(*gs1, struct gensec_security_ops)); + SMB_ASSERT(talloc_get_type(*gs2, struct gensec_security_ops)); + + return (*gs2)->order - (*gs1)->order; +} + /* initialise the GENSEC subsystem */ @@ -1264,6 +1271,8 @@ run_init_functions(shared_init); talloc_free(shared_init); + + qsort(generic_security_ops, gensec_num_backends, sizeof(*generic_security_ops), QSORT_CAST sort_gensec); return NT_STATUS_OK; }