summaryrefslogtreecommitdiff
path: root/source4/param
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-11-02 23:58:49 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-11-02 23:58:49 +0100
commitb45caa44e1a563a3af42e39bd61ee4a2b74db14f (patch)
tree7192b08a17144b826a6b60bacf0317a7aabe5c1b /source4/param
parent4147ad1e98f04627f9072784e69c72cd72ea206c (diff)
downloadsamba-b45caa44e1a563a3af42e39bd61ee4a2b74db14f.tar.gz
samba-b45caa44e1a563a3af42e39bd61ee4a2b74db14f.tar.bz2
samba-b45caa44e1a563a3af42e39bd61ee4a2b74db14f.zip
Fix the build.
Diffstat (limited to 'source4/param')
-rw-r--r--source4/param/loadparm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 766194570c..1ab842c8f8 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2478,7 +2478,7 @@ bool lp_load(struct loadparm_context *lp_ctx, const char *filename)
reload_charcnv(lp_ctx);
- ntstatus_check_dos_mapping = lp_nt_status_support(lp_ctx);
+ /* FIXME: ntstatus_check_dos_mapping = lp_nt_status_support(lp_ctx); */
/* FIXME: This is a bit of a hack, but we can't use a global, since
* not everything that uses lp also uses the socket library */
@@ -2687,9 +2687,10 @@ _PUBLIC_ struct dcerpc_server_info *lp_dcerpc_server_info(TALLOC_CTX *mem_ctx, s
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);
+ struct gensec_settings *settings = talloc(NULL, struct gensec_settings);
if (settings == NULL)
return NULL;
+ SMB_ASSERT(lp_ctx != 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");