diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 02:05:48 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 02:05:48 +0100 |
| commit | b034c519f53cffbac21c3db79ee24cdd8f1ce4a2 (patch) | |
| tree | d27a5e0010bdaf1f9f47174cb244b90f3feb96a6 /source4/param | |
| parent | 9265cb02d00843f43ba07d28093f959adf0738fe (diff) | |
| download | samba-b034c519f53cffbac21c3db79ee24cdd8f1ce4a2.tar.gz samba-b034c519f53cffbac21c3db79ee24cdd8f1ce4a2.tar.bz2 samba-b034c519f53cffbac21c3db79ee24cdd8f1ce4a2.zip | |
Add gensec_settings structure. This wraps loadparm_context for now, but
should in the future only contain some settings required for gensec.
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 12 | ||||
| -rw-r--r-- | source4/param/param.h | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 6494199fa4..0c831b23d8 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -66,6 +66,7 @@ #include "libcli/raw/libcliraw.h" #include "rpc_server/common/common.h" #include "lib/socket/socket.h" +#include "auth/gensec/gensec.h" #define standard_sub_basic talloc_strdup @@ -2674,3 +2675,14 @@ _PUBLIC_ struct dcerpc_server_info *lp_dcerpc_server_info(TALLOC_CTX *mem_ctx, s return ret; } + +struct gensec_settings *lp_gensec_settings(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) +{ + struct gensec_settings *settings = talloc(mem_ctx, struct gensec_settings); + if (settings == NULL) + return NULL; + settings->lp_ctx = talloc_reference(settings, lp_ctx); + settings->iconv_convenience = lp_iconv_convenience(lp_ctx); + settings->target_hostname = lp_parm_string(lp_ctx, NULL, "gensec", "target_hostname"); + return settings; +} diff --git a/source4/param/param.h b/source4/param/param.h index 8a653be0a8..80bb5ff128 100644 --- a/source4/param/param.h +++ b/source4/param/param.h @@ -67,6 +67,7 @@ struct loadparm_context; struct loadparm_service; struct smbcli_options; struct smbcli_session_options; +struct gensec_settings; void reload_charcnv(struct loadparm_context *lp_ctx); @@ -166,7 +167,6 @@ int lp_cli_minprotocol(struct loadparm_context *); int lp_security(struct loadparm_context *); bool lp_paranoid_server_security(struct loadparm_context *); int lp_announce_as(struct loadparm_context *); -const char **lp_js_include(struct loadparm_context *); const char *lp_servicename(const struct loadparm_service *service); const char *lp_pathname(struct loadparm_service *, struct loadparm_service *); @@ -329,6 +329,7 @@ void lp_smbcli_options(struct loadparm_context *lp_ctx, void lp_smbcli_session_options(struct loadparm_context *lp_ctx, struct smbcli_session_options *options); struct dcerpc_server_info *lp_dcerpc_server_info(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx); +struct gensec_settings *lp_gensec_settings(TALLOC_CTX *, struct loadparm_context *); /* The following definitions come from param/generic.c */ |