diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-28 12:16:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-28 12:16:18 +0200 |
| commit | 10e06c833a55b972c0e4943eea3223f21ad73736 (patch) | |
| tree | d7013fc4235eb7a235d514686c712f7958316d69 /runtime/glbl.c | |
| parent | 76e4eb29d4343d11cb2e4b354f7d7d14df707b7a (diff) | |
| download | rsyslog-10e06c833a55b972c0e4943eea3223f21ad73736.tar.gz rsyslog-10e06c833a55b972c0e4943eea3223f21ad73736.tar.xz rsyslog-10e06c833a55b972c0e4943eea3223f21ad73736.zip | |
added $DefaultNetstreamDriver config directive
Diffstat (limited to 'runtime/glbl.c')
| -rw-r--r-- | runtime/glbl.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/runtime/glbl.c b/runtime/glbl.c index 787b6ab7..7b584d30 100644 --- a/runtime/glbl.c +++ b/runtime/glbl.c @@ -40,9 +40,7 @@ /* some defaults */ #ifndef DFLT_NETSTRM_DRVR -// TESTING ONLY# define DFLT_NETSTRM_DRVR ((uchar*)"lmnsd_ptcp") -#warning "define must be restored for non-testing!" -# define DFLT_NETSTRM_DRVR ((uchar*)"lmnsd_gtls") +# define DFLT_NETSTRM_DRVR ((uchar*)"lmnsd_ptcp") #endif /* static data */ @@ -120,7 +118,7 @@ GetWorkDir(void) static uchar* GetDfltNetstrmDrvr(void) { - return(pszDfltNetstrmDrvr == NULL ? DFLT_NETSTRM_DRVR : pszWorkDir); + return(pszDfltNetstrmDrvr == NULL ? DFLT_NETSTRM_DRVR : pszDfltNetstrmDrvr); } @@ -185,6 +183,7 @@ BEGINAbstractObjClassInit(glbl, 1, OBJ_IS_CORE_MODULE) /* class, version */ /* register config handlers (TODO: we need to implement a way to unregister them) */ CHKiRet(regCfSysLineHdlr((uchar *)"workdirectory", 0, eCmdHdlrGetWord, NULL, &pszWorkDir, NULL)); CHKiRet(regCfSysLineHdlr((uchar *)"dropmsgswithmaliciousdnsptrrecords", 0, eCmdHdlrBinary, NULL, &bDropMalPTRMsgs, NULL)); + CHKiRet(regCfSysLineHdlr((uchar *)"defaultnetstreamdriver", 0, eCmdHdlrGetWord, NULL, &pszDfltNetstrmDrvr, NULL)); CHKiRet(regCfSysLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, NULL)); ENDObjClassInit(glbl) |