From e0ca4d182eda0111553dbb9c5500bbcc0370ee07 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 2 Apr 2008 08:08:13 +0000 Subject: file relputil.c deleted, not actually neeeded --- ChangeLog | 2 ++ Makefile.am | 11 ------ relputil.c | 113 ------------------------------------------------------------ 3 files changed, 2 insertions(+), 124 deletions(-) delete mode 100644 relputil.c diff --git a/ChangeLog b/ChangeLog index 3a13cccf..4f259084 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ Version 3.15.1 (rgerhards), 2008-04-?? - disabled atomic operations for the time being because they introduce some cross-platform trouble - need to see how to fix this in the best possible way +- added librelp check via PKG_CHECK thanks to Michael Biebl's patch +- file relputil.c deleted, is not actually needed --------------------------------------------------------------------------- Version 3.15.0 (rgerhards), 2008-04-01 - major new feature: imrelp/omrelp support reliable delivery of syslog diff --git a/Makefile.am b/Makefile.am index 75250925..f97687c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -167,17 +167,6 @@ lmgssutil_la_LDFLAGS = -module -avoid-version lmgssutil_la_LIBADD = $(gss_libs) endif -# -# relp support -# -if ENABLE_RELP -#pkglib_LTLIBRARIES += lmrelputil.la -#lmrelputil_la_SOURCES = relputil.c relputil.h -#lmrelputil_la_CPPFLAGS = $(pthreads_cflags) $(relp_cflags) -#lmrelputil_la_LDFLAGS = -module -avoid-version -#lmrelputil_la_LIBADD = $(relp_libs) -endif - EXTRA_DIST = \ redhat/rsyslog.conf \ redhat/rsyslog.init \ diff --git a/relputil.c b/relputil.c deleted file mode 100644 index e90cb5a3..00000000 --- a/relputil.c +++ /dev/null @@ -1,113 +0,0 @@ -/* relputil.c - * - * This is a miscellaneous helper class for RELP features. - * - * Copyright 2008 Rainer Gerhards and Adiscon GmbH. - * - * This file is part of rsyslog. - * - * Rsyslog is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Rsyslog is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Rsyslog. If not, see . - * - * A copy of the GPL can be found in the file "COPYING" in this distribution. - */ -#include "config.h" -#include "rsyslog.h" -#include -#include -#include -#include -#include -#include -#include -#include "syslogd.h" -#include "syslogd-types.h" -#include "srUtils.h" -#include "net.h" -#include "omfwd.h" -#include "template.h" -#include "msg.h" -#include "tcpsyslog.h" -#include "module-template.h" -#include "obj.h" -#include "errmsg.h" -#include "relputil.h" - -MODULE_TYPE_LIB - -/* static data */ -DEFobjStaticHelpers -DEFobjCurrIf(errmsg) - - -/* queryInterface function - * rgerhards, 2008-02-29 - */ -BEGINobjQueryInterface(relputil) -CODESTARTobjQueryInterface(relputil) - if(pIf->ifVersion != relputilCURR_IF_VERSION) { /* check for current version, increment on each change */ - ABORT_FINALIZE(RS_RET_INTERFACE_NOT_SUPPORTED); - } - - /* ok, we have the right interface, so let's fill it - * Please note that we may also do some backwards-compatibility - * work here (if we can support an older interface version - that, - * of course, also affects the "if" above). - */ - -finalize_it: -ENDobjQueryInterface(relputil) - - -/* exit our class - * rgerhards, 2008-03-10 - */ -BEGINObjClassExit(relputil, OBJ_IS_LOADABLE_MODULE) /* CHANGE class also in END MACRO! */ -CODESTARTObjClassExit(relputil) - /* release objects we no longer need */ - objRelease(errmsg, CORE_COMPONENT); -ENDObjClassExit(relputil) - - -/* Initialize our class. Must be called as the very first method - * before anything else is called inside this class. - * rgerhards, 2008-02-29 - */ -BEGINAbstractObjClassInit(relputil, 1, OBJ_IS_LOADABLE_MODULE) /* class, version - CHANGE class also in END MACRO! */ - /* request objects we use */ - CHKiRet(objUse(errmsg, CORE_COMPONENT)); -ENDObjClassInit(relputil) - - -/* --------------- here now comes the plumbing that makes as a library module --------------- */ - - -BEGINmodExit -CODESTARTmodExit - relputilClassExit(); -ENDmodExit - - -BEGINqueryEtryPt -CODESTARTqueryEtryPt -CODEqueryEtryPt_STD_LIB_QUERIES -ENDqueryEtryPt - - -BEGINmodInit() -CODESTARTmodInit - *ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */ - - /* Initialize all classes that are in our module - this includes ourselfs */ - CHKiRet(relputilClassInit(pModInfo)); /* must be done after tcps_sess, as we use it */ -ENDmodInit -- cgit