summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-09-08 05:24:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:56 -0500
commit71a9ca56d0052ecfb1f76f9c8a3535f3bc11b0e6 (patch)
tree99f06a90236d409591315f44b4080e152ef52763
parentf09352781932116997fd6ff1471e34983dbccadc (diff)
downloadsamba-71a9ca56d0052ecfb1f76f9c8a3535f3bc11b0e6.tar.gz
samba-71a9ca56d0052ecfb1f76f9c8a3535f3bc11b0e6.tar.xz
samba-71a9ca56d0052ecfb1f76f9c8a3535f3bc11b0e6.zip
r18253: Turn Cyrus-SASL DIGEST-MD5 off by default for now.
Andrew Bartlett (This used to be commit 2da948cb6ecc75e2b4b97c770c8ba13b7f831d6e)
-rw-r--r--source4/auth/gensec/cyrus_sasl.c2
-rw-r--r--source4/auth/gensec/gensec.c9
2 files changed, 10 insertions, 1 deletions
diff --git a/source4/auth/gensec/cyrus_sasl.c b/source4/auth/gensec/cyrus_sasl.c
index 34037a8087e..661e12f4558 100644
--- a/source4/auth/gensec/cyrus_sasl.c
+++ b/source4/auth/gensec/cyrus_sasl.c
@@ -308,7 +308,7 @@ static const struct gensec_security_ops gensec_sasl_security_ops = {
.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
};
diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c
index c4b1e2494a8..0719fb2df6b 100644
--- a/source4/auth/gensec/gensec.c
+++ b/source4/auth/gensec/gensec.c
@@ -1245,6 +1245,13 @@ const struct gensec_critical_sizes *gensec_interface_version(void)
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 @@ NTSTATUS gensec_init(void)
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;
}