diff options
| author | Matthieu Patou <mat@matws.net> | 2012-09-17 16:51:02 -0700 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-09-18 06:12:00 +0200 |
| commit | 2a7484eb7286a6896826ad1ed15aa7b1760a451c (patch) | |
| tree | 6a9acec35bca81cbac682b055d651da78e59d41f | |
| parent | 56956910051a8d11b36d125780fde048d29ad604 (diff) | |
| download | samba-2a7484eb7286a6896826ad1ed15aa7b1760a451c.tar.gz samba-2a7484eb7286a6896826ad1ed15aa7b1760a451c.tar.bz2 samba-2a7484eb7286a6896826ad1ed15aa7b1760a451c.zip | |
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
| -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 990dd294b9..b2e4218611 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 f1999ad817..61606ce9d2 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" |