diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-12-14 17:54:04 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-12-14 22:29:58 +1100 |
| commit | b11b22752a9a0d2e88e4857c0e211298d2a7b8a3 (patch) | |
| tree | 2f0e12c2f88d59bcd86c1b88cf2c8ab73e5a31c8 | |
| parent | 7f16da7473c5daa37f07ea20491f0a96debff03a (diff) | |
| download | samba-b11b22752a9a0d2e88e4857c0e211298d2a7b8a3.tar.gz samba-b11b22752a9a0d2e88e4857c0e211298d2a7b8a3.tar.bz2 samba-b11b22752a9a0d2e88e4857c0e211298d2a7b8a3.zip | |
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.
| -rw-r--r-- | source4/param/loadparm.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; } |