diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | plugins/omlibdbi/omlibdbi.c | 13 |
3 files changed, 11 insertions, 9 deletions
@@ -6,6 +6,8 @@ Version 3.11.3 (rgerhards), 2008-02-?? - added support for better plugin handling in libdbi (we contributed a patch to do that, we just now need to wait for the next libdbi version) +- bugfix: fixed abort when invalid template was provided to an action + bug http://bugzilla.adiscon.com/show_bug.cgi?id=4 --------------------------------------------------------------------------- Version 3.11.2 (rgerhards), 2008-02-15 - added the capability to monitor text files and process their content diff --git a/configure.ac b/configure.ac index 4e77e933..59bd1195 100644 --- a/configure.ac +++ b/configure.ac @@ -402,6 +402,11 @@ if test "x$enable_libdbi" = "xyes"; then ], [AC_MSG_FAILURE([libdbi library is missing])] ) + AC_CHECK_LIB( + [dbi], + [dbi_initialize_r], + [AC_DEFINE([HAVE_DBI_R], [1], [Define to 1 if libdbi supports the new plugin-safe interface])] + ) fi AM_CONDITIONAL(ENABLE_OMLIBDBI, test x$enable_libdbi = xyes) AC_SUBST(libdbi_cflags) diff --git a/plugins/omlibdbi/omlibdbi.c b/plugins/omlibdbi/omlibdbi.c index 77b17310..610d106e 100644 --- a/plugins/omlibdbi/omlibdbi.c +++ b/plugins/omlibdbi/omlibdbi.c @@ -48,11 +48,6 @@ #include "module-template.h" #include "debug.h" -/* this is a temporary setting to select either the old- or new-style libdbi - * calls. -- rgerhards, 2008-02-16 - */ -#define USE_DBI_R_CALLS 0 - MODULE_TYPE_OUTPUT /* internal structures @@ -78,7 +73,7 @@ static uchar *host = NULL; /* host to connect to */ static uchar *usrName = NULL; /* user name for connect */ static uchar *pwd = NULL; /* password for connect */ static uchar *dbName = NULL; /* database to use */ -#if USE_DBI_R_CALLS == 1 +#ifdef HAVE_DBI_R static dbi_inst dbiInst; #endif @@ -169,7 +164,7 @@ static rsRetVal initConn(instanceData *pData, int bSilent) if(bDbiInitialized == 0) { /* we need to init libdbi first */ -# if USE_DBI_R_CALLS == 1 +# ifdef HAVE_DBI_R iDrvrsLoaded = dbi_initialize_r((char*) dbiDrvrDir, &dbiInst); # else iDrvrsLoaded = dbi_initialize((char*) dbiDrvrDir); @@ -184,7 +179,7 @@ static rsRetVal initConn(instanceData *pData, int bSilent) bDbiInitialized = 1; /* we are done for the rest of our existence... */ } -# if USE_DBI_R_CALLS == 1 +# ifdef HAVE_DBI_R pData->conn = dbi_conn_new_r((char*)pData->drvrName, dbiInst); # else pData->conn = dbi_conn_new((char*)pData->drvrName); @@ -307,7 +302,7 @@ BEGINmodExit CODESTARTmodExit /* if we initialized libdbi, we now need to cleanup */ if(bDbiInitialized) { -# if USE_DBI_R_CALLS == 1 +# ifdef HAVE_DBI_R dbi_shutdown_r(dbiInst); # else dbi_shutdown(); |