Merge pull request #2483 from rgerhards/i2482

fix global parameter name shutdown.enable.ctl-c
This commit is contained in:
Rainer Gerhards 2018-02-16 08:19:17 +01:00 committed by GitHub
commit cb20a2dbc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -185,7 +185,7 @@ static struct cnfparamdescr cnfparamdescr[] = {
{ "internalmsg.ratelimit.interval", eCmdHdlrPositiveInt, 0 },
{ "internalmsg.ratelimit.burst", eCmdHdlrPositiveInt, 0 },
{ "errormessagestostderr.maxnumber", eCmdHdlrPositiveInt, 0 },
{ "shutdown.enable.ctl-c", eCmdHdlrBinary, 0 },
{ "shutdown.enable.ctlc", eCmdHdlrBinary, 0 },
{ "debug.files", eCmdHdlrArray, 0 },
{ "debug.whitelist", eCmdHdlrBinary, 0 }
};
@ -1291,7 +1291,7 @@ glblDoneLoadCnf(void)
glblDbgWhitelist = (int) cnfparamvals[i].val.d.n;
} else if(!strcmp(paramblk.descr[i].name, "umask")) {
loadConf->globals.umask = (int) cnfparamvals[i].val.d.n;
} else if(!strcmp(paramblk.descr[i].name, "shutdown.enable.ctl-c")) {
} else if(!strcmp(paramblk.descr[i].name, "shutdown.enable.ctlc")) {
glblPermitCtlC = (int) cnfparamvals[i].val.d.n;
} else {
dbgprintf("glblDoneLoadCnf: program error, non-handled "