diff -ruBbd cacti-086-current/include/config.php cacti-086-new/include/config.php
--- cacti-086-current/include/config.php	2005-03-24 22:11:39.452732464 -0600
+++ cacti-086-new/include/config.php	2005-03-24 22:12:44.884785280 -0600
@@ -99,15 +99,18 @@
 /* display ALL errors */
 error_reporting(E_ALL);
 
-/* connect to the database server */
+/* include base modules */
 include($config["library_path"] . "/adodb/adodb.inc.php");
 include($config["library_path"] . "/database.php");
-db_connect_real($database_hostname, $database_username, $database_password, $database_default, $database_type);
-
 include_once($config["library_path"] . "/functions.php");
 include_once($config["include_path"] . "/config_constants.php");
 include_once($config["include_path"] . "/config_arrays.php");
 include_once($config["include_path"] . "/config_settings.php");
+
+/* connect to the database server */
+db_connect_real($database_hostname, $database_username, $database_password, $database_default, $database_type);
+
+/* include additional modules */
 include_once($config["include_path"] . "/config_form.php");
 include_once($config["library_path"] . "/html.php");
 include_once($config["library_path"] . "/html_form.php");
diff -ruBbd cacti-086-current/lib/database.php cacti-086-new/lib/database.php
--- cacti-086-current/lib/database.php	2005-03-24 22:11:20.453620768 -0600
+++ cacti-086-new/lib/database.php	2005-03-24 22:12:56.880961584 -0600
@@ -61,8 +61,6 @@
 function db_execute($sql) {
 	global $cnn_id;
 
-	if (!$cnn_id) { db_connect(); }
-
 	$query = $cnn_id->Execute($sql);
 
 	if ($query) {
@@ -80,8 +78,6 @@
 function db_fetch_cell($sql,$col_name = '') {
 	global $cnn_id;
 
-	if (!$cnn_id) { db_connect(); }
-
 	if ($col_name != '') {
 		$cnn_id->SetFetchMode(ADODB_FETCH_ASSOC);
 	}else{
@@ -107,8 +103,6 @@
 function db_fetch_row($sql) {
 	global $cnn_id;
 
-	if (!$cnn_id) { db_connect(); }
-
 	$cnn_id->SetFetchMode(ADODB_FETCH_ASSOC);
 	$query = $cnn_id->Execute($sql);
 
@@ -125,8 +119,6 @@
 function db_fetch_assoc($sql) {
 	global $cnn_id;
 
-	if (!$cnn_id) { db_connect(); }
-
 	$data = array();
 	$cnn_id->SetFetchMode(ADODB_FETCH_ASSOC);
 	$query = $cnn_id->Execute($sql);