[icinga-checkins] icinga.org: icinga-core/next: idoutils: check for oracle driver: temporary initialize ocilib to get runtime version (replaces previous fix)

[git at icinga.org]

Module: icinga-core
Branch: next
Commit: f60cb48e9f64b1dddc9a8c40748e1483ef2b6b90
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=f60cb48e9f64b1dddc9a8c40748e1483ef2b6b90

Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Sun Jan 29 16:06:28 2012 +0100

idoutils: check for oracle driver: temporary initialize ocilib to get runtime version (replaces previous fix)

---

 module/idoutils/src/ido2db.c |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/module/idoutils/src/ido2db.c b/module/idoutils/src/ido2db.c
index 3a8ed04..96c42fc 100644
--- a/module/idoutils/src/ido2db.c
+++ b/module/idoutils/src/ido2db.c
@@ -114,6 +114,10 @@ int main(int argc, char **argv) {
 
 	driver = NULL;
 #endif
+#ifdef USE_ORACLE
+	unsigned int v1,v2;
+#endif
+
 	result = ido2db_process_arguments(argc, argv);
 
 	if (result != IDO_OK || ido2db_show_help == IDO_TRUE || ido2db_show_license == IDO_TRUE || ido2db_show_version == IDO_TRUE) {
@@ -255,19 +259,23 @@ int main(int argc, char **argv) {
 	/******************************/
 #ifdef USE_ORACLE /* Oracle ocilib specific */
 
-	ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db with ocilib() driver check\n");
-	dummy=OCI_GetOCIRuntimeVersion();
-	if (dummy == OCI_UNKNOWN) {
-		printf("Unknown ocilib runtime version detected. Exiting...\n");
-
-#ifdef HAVE_SSL
-		if (use_ssl == IDO_TRUE)
-			SSL_CTX_free(ctx);
-#endif
-
-		exit(1);
+	ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db with ocilib() driver compiled\n");
+	/* at this stage, is oci driver not loaded, but loading will be later in db_init.
+	 * check will try to init,read variables and cleanup afterwards
+	 */
+	if (OCI_Initialize(NULL,NULL,OCI_ENV_DEFAULT)) {
+	    v1=OCI_GetOCIRuntimeVersion();
+	    v2=OCI_GetOCICompileVersion();
+	    ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ocilib() driver check OK(Runtime:%u,CompileTime:%u)\n",
+	        v1,v2);
+	    /* we need to cleanup to succeed ido2db_db_init */
+	        OCI_Cleanup();
+	}else{
+	        printf("Cannot initialize ocilib, exit!\n");
+	        exit (1);
 	}
 
+
 #endif /* Oracle ocilib specific */
 	/******************************/