mirror of
https://github.com/rsyslog/rsyslog.git
synced 2025-12-18 19:10:42 +01:00
5c35619385
permitnonkernelfacility doesn't work when the new configuration syntax is used, e.g. 'module(load="imklog" permitnonkernelfacility="on")'. It does work with the old syntax, e.g. '$KLogPermitNonKernelFacility on' This is because the old style config is stored in a static global struct "cs", while the new style config is passed in as a pointer. Code in imklog will put old style config entries into the new config struct, and almost all the code in imklog uses the new config struct like it should. Except for a check for bPermitNonKernel in Syslog() that continued to use the static global that only has old style configs. Fix this by passing pModConf down into Syslog() and using that in place of the static global. closes https://github.com/rsyslog/rsyslog/issues/477
72 lines
2.4 KiB
C
72 lines
2.4 KiB
C
/* imklog.h
|
|
* These are the definitions for the klog message generation module.
|
|
*
|
|
* File begun on 2007-12-17 by RGerhards
|
|
* Major change: 2008-04-09: switched to a driver interface for
|
|
* several platforms
|
|
*
|
|
* Copyright 2007-2015 Rainer Gerhards and Adiscon GmbH.
|
|
*
|
|
* This file is part of rsyslog.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
* -or-
|
|
* see COPYING.ASL20 in the source distribution
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
#ifndef IMKLOG_H_INCLUDED
|
|
#define IMKLOG_H_INCLUDED 1
|
|
|
|
#include "rsyslog.h"
|
|
#include "dirty.h"
|
|
|
|
/* we need to have the modConf type present in all submodules */
|
|
struct modConfData_s {
|
|
rsconf_t *pConf;
|
|
int iFacilIntMsg;
|
|
uchar *pszPath;
|
|
int console_log_level;
|
|
sbool bParseKernelStamp;
|
|
sbool bKeepKernelStamp;
|
|
sbool bPermitNonKernel;
|
|
sbool configSetViaV2Method;
|
|
};
|
|
|
|
/* interface to "drivers"
|
|
* the platform specific drivers must implement these entry points. Only one
|
|
* driver may be active at any given time, thus we simply rely on the linker
|
|
* to resolve the addresses.
|
|
* rgerhards, 2008-04-09
|
|
*/
|
|
rsRetVal klogLogKMsg(modConfData_t *pModConf);
|
|
rsRetVal klogAfterRun(modConfData_t *pModConf);
|
|
rsRetVal klogWillRunPrePrivDrop(modConfData_t *pModConf);
|
|
rsRetVal klogWillRunPostPrivDrop(modConfData_t *pModConf);
|
|
int klogFacilIntMsg(void);
|
|
|
|
/* the functions below may be called by the drivers */
|
|
rsRetVal imklogLogIntMsg(syslog_pri_t priority, const char *fmt, ...) __attribute__((format(printf,2, 3)));
|
|
rsRetVal Syslog(modConfData_t *pModConf, syslog_pri_t priority, uchar *msg, struct timeval *tp);
|
|
|
|
/* prototypes */
|
|
extern int klog_getMaxLine(void); /* work-around for klog drivers to get configured max line size */
|
|
extern int InitKsyms(modConfData_t*);
|
|
extern void DeinitKsyms(void);
|
|
extern int InitMsyms(void);
|
|
extern void DeinitMsyms(void);
|
|
extern char * ExpandKadds(char *, char *);
|
|
extern void SetParanoiaLevel(int);
|
|
|
|
#endif /* #ifndef IMKLOG_H_INCLUDED */
|
|
/* vi:set ai:
|
|
*/
|