sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

gensec: Allow an alternate set of modules to be specified

Browse Source 
This will allow s3 to specify modules to use as a list, rather than
needing to start the individual module with gensec_start_mech_by_ops()

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2011-12-26 10:53:56 +11:00
parent 1364eb7bd7
commit 4b7b26e3c0
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
auth/gensec/gensec.h
View File

@ -77,6 +77,11 @@ struct tevent_req;
struct gensec_settings {
struct loadparm_context *lp_ctx;
const char *target_hostname;
/* this allows callers to specify a specific set of ops that
* should be used, rather than those loaded by the plugin
* mechanism */
struct gensec_security_ops **backends;
};
struct gensec_security_ops {

7
auth/gensec/gensec_start.c
View File

@ -118,14 +118,19 @@ struct gensec_security_ops **gensec_security_mechs(struct gensec_security *gense
TALLOC_CTX *mem_ctx)
{
struct gensec_security_ops **backends;
backends = gensec_security_all();
if (!gensec_security) {
backends = gensec_security_all();
if (!talloc_reference(mem_ctx, backends)) {
return NULL;
}
return backends;
} else {
struct cli_credentials *creds = gensec_get_credentials(gensec_security);
if (gensec_security->settings->backends) {
backends = gensec_security->settings->backends;
} else {
backends = gensec_security_all();
}
if (!creds) {
if (!talloc_reference(mem_ctx, backends)) {
return NULL;

2
lib/param/loadparm.c
View File

@ -3727,7 +3727,7 @@ _PUBLIC_ char *lpcfg_tls_dhpfile(TALLOC_CTX *mem_ctx, struct loadparm_context *l
struct gensec_settings *lpcfg_gensec_settings(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
{
struct gensec_settings *settings = talloc(mem_ctx, struct gensec_settings);
struct gensec_settings *settings = talloc_zero(mem_ctx, struct gensec_settings);
if (settings == NULL)
return NULL;
SMB_ASSERT(lp_ctx != NULL);