diff options
| author | Matthieu Patou <mat@matws.net> | 2012-09-17 16:51:02 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2012-09-28 09:23:07 +0200 |
| commit | 28f6a6d8c542e8f1ff71486cb5fefceba86345e7 (patch) | |
| tree | 428287010b5548ce0717752e497ea26fe13f42f7 | |
| parent | 6d9841db350aae14e26b23fa79a48786274e084c (diff) | |
| download | samba-28f6a6d8c542e8f1ff71486cb5fefceba86345e7.tar.gz | |
panic action is defined as GLOBAL_VAR(szPanicAction) not GLOBAL_VAR(panic_action)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Sep 18 06:12:00 CEST 2012 on sn-devel-104
(cherry picked from commit 2a7484eb7286a6896826ad1ed15aa7b1760a451c)
Fix bug #9199 - fix usage of panic action.
| -rw-r--r-- | lib/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 990dd294b91..b2e42186119 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -2295,7 +2295,7 @@ static bool lpcfg_update(struct loadparm_context *lp_ctx) return true; } - panic_action = lp_ctx->globals->panic_action; + panic_action = lp_ctx->globals->szPanicAction; reload_charcnv(lp_ctx); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index f1999ad8171..61606ce9d20 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -131,7 +131,6 @@ static bool defaults_saved = false; char *tls_cafile; \ char *tls_crlfile; \ char *tls_dhpfile; \ - char *panic_action; \ int bPreferredMaster; #include "param/param_global.h" |