From 42aa1bdf9e5575dbb0f2da1fd8ec2808ef9ad131 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Mon, 11 May 2009 14:59:40 +0000
Subject: [PATCH] updates

git-svn-id: http://www.observium.org/svn/observer/trunk@432 61d68cd4-352d-0410-923a-c4978735b2b8
---
 config.php.default             | 4 ++++
 html/includes/authenticate.inc | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/config.php.default b/config.php.default
index a571596f2..068c0a4c7 100755
--- a/config.php.default
+++ b/config.php.default
@@ -82,6 +82,10 @@ $config['enable_pseudowires']	= 0; # Enable Cisco Pseudowires
 
 ## Uncomment this to enable display of rancid-collected configs
 #$config['rancid_configs']      = '/var/lib/rancid/network/configs/';
+
+## Uncomment this to enable usage of collectd rrds collectd hostnames must match observer hostnames!
+#$config['collectd_dir']         = '/var/lib/collectd/rrd';
+
 $config['cdp_autocreate']       = false;    # Should we autocreate hosts we see via CDP?
 $config['snmp_autodiscovery']   = false;    # Should we scan for and autocreate hosts via snmp?
                                             # SNMP autodiscovery is * NOT WORKING *
diff --git a/html/includes/authenticate.inc b/html/includes/authenticate.inc
index 92e3e3c74..ba0d32e40 100644
--- a/html/includes/authenticate.inc
+++ b/html/includes/authenticate.inc
@@ -1,6 +1,8 @@
 <?php 
 
-@ini_set("session.gc_maxlifetime","10000"); 
+
+@ini_set("session.gc_maxlifetime","0"); 
+
 session_start();
 
 if($_GET['logout']) {
@@ -12,6 +14,8 @@ if($_GET['logout']) {
   mysql_query("INSERT INTO authlog (`user`,`address`,`result`) VALUES ('$olduser', '".$_SERVER["REMOTE_ADDR"]."', 'logged out')");
   $auth_message = "Logged Out";
 } else {
+
+
   if($_POST['username'] && $_POST['password']){
     $username = mres($_POST['username']);
     $password = mres($_POST['password']);