diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-01-03 04:25:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:49:38 -0500 |
| commit | 097ffed015826ff31b5f89742deed8f4d21b88f3 (patch) | |
| tree | 4110f419526b86eabaed2d22d9bdcaed262500a8 | |
| parent | bedfb063268f70e66f16fdd0e9bdd29d176a0634 (diff) | |
| download | samba-097ffed015826ff31b5f89742deed8f4d21b88f3.tar.gz samba-097ffed015826ff31b5f89742deed8f4d21b88f3.tar.bz2 samba-097ffed015826ff31b5f89742deed8f4d21b88f3.zip | |
r12687: Push the real list of supported GENSEC mechanisms out on
supportedSASLMechanism in the rootdse. (Second half of a patch
commited earlier today).
Andrew Bartlett
(This used to be commit 4b67b5d688493c385e12734fd2c0c9dbc1b238e4)
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/rootdse.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c index a421199038..93bc9903ed 100644 --- a/source4/dsdb/samdb/ldb_modules/rootdse.c +++ b/source4/dsdb/samdb/ldb_modules/rootdse.c @@ -24,6 +24,7 @@ #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" #include "lib/ldb/include/ldb_private.h" +#include "auth/gensec/gensec.h" #include <time.h> /* @@ -43,6 +44,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_request *re { struct ldb_search *s = &req->op.search; struct ldb_message *msg; + struct cli_credentials *server_creds; /* this is gross, and will be removed when I change ldb_result not to be so pointer crazy :-) */ @@ -61,6 +63,25 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_request *re } } + server_creds = talloc_get_type(ldb_get_opaque(module->ldb, "server_credentials"), + struct cli_credentials); + if (do_attribute(s->attrs, "supportedSASLMechanisms")) { + const struct gensec_security_ops **ops = cli_credentials_gensec_list(server_creds); + int i; + for (i = 0; ops && ops[i]; i++) { + if (ops[i]->sasl_name) { + const char *sasl_name = talloc_strdup(msg, ops[i]->sasl_name); + if (!sasl_name) { + goto failed; + } + if (ldb_msg_add_string(msg, "supportedSASLMechanisms", + sasl_name) != 0) { + goto failed; + } + } + } + } + /* TODO: lots more dynamic attributes should be added here */ return 0; |