diff options
author | Andrew Tridgell <tridge@samba.org> | 2008-09-30 13:02:09 -0700 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2008-09-30 13:02:09 -0700 |
commit | f84093df863eb00238a6be1caba59d926f18e7a5 (patch) | |
tree | f72c5aa9bfae972a5a376767a271eac5d5ded085 /source4/smbd/process_standard.c | |
parent | ef6fc37add1fd9164eb143c953fde0d5a9fc584a (diff) | |
parent | 687ce0b60a3913b0f2eca2365a5ab56e78523ab5 (diff) | |
download | samba-f84093df863eb00238a6be1caba59d926f18e7a5.tar.gz samba-f84093df863eb00238a6be1caba59d926f18e7a5.tar.bz2 samba-f84093df863eb00238a6be1caba59d926f18e7a5.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/smbd/process_standard.c')
-rw-r--r-- | source4/smbd/process_standard.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index c8f90209b6..0a864dabb2 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -196,13 +196,14 @@ static void standard_new_task(struct event_context *ev, /* called when a task goes down */ -_NORETURN_ static void standard_terminate(struct event_context *ev, const char *reason) +_NORETURN_ static void standard_terminate(struct event_context *ev, struct loadparm_context *lp_ctx, + const char *reason) { DEBUG(2,("standard_terminate: reason[%s]\n",reason)); /* this reload_charcnv() has the effect of freeing the iconv context memory, which makes leak checking easier */ - reload_charcnv(global_loadparm); + reload_charcnv(lp_ctx); talloc_free(ev); |