From b11b22752a9a0d2e88e4857c0e211298d2a7b8a3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 14 Dec 2009 17:54:04 +1100 Subject: s4-loadparm: call reload_charcnv() also for a missing smb.conf bin/net vampire with a missing smb.conf would segfault as the iconv convenience pointer had not been setup. --- source4/param/loadparm.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source4') diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index d65c3f9b16..f31d216e09 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -2552,6 +2552,10 @@ bool lp_load(struct loadparm_context *lp_ctx, const char *filename) bRetval = bRetval && lp_update(lp_ctx); + /* we do this unconditionally, so that it happens even + for a missing smb.conf */ + reload_charcnv(lp_ctx); + return bRetval; } -- cgit