panic action is defined as GLOBAL_VAR(szPanicAction) not GLOBAL_VAR(panic_action)
authorMatthieu Patou <mat@matws.net>
Mon, 17 Sep 2012 23:51:02 +0000 (16:51 -0700)
committerStefan Metzmacher <metze@samba.org>
Tue, 18 Sep 2012 02:32:14 +0000 (04:32 +0200)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
lib/param/loadparm.c
source3/param/loadparm.c

index 990dd294b9114de1c0b2df5dfc8b53e28aa911cf..b2e4218611909e0a78b68dc77d762a8a9d1c7409 100644 (file)
@@ -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);
 
index f1999ad81714705f7c75a4adde8f82c15f16b225..61606ce9d20577b00df9c9a061c6a75020660f59 100644 (file)
@@ -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"