From 8d51b40b5bf90351bd013ad3daa9569b2f399a3d Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 12 Feb 2014 11:58:52 -0800
Subject: [PATCH] fix login with an existing session cookie, RT#25533

---
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index f84f5d633..84998bb73 100755
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -101,6 +101,8 @@ if ( $cgi->param('action') =~ /^(\w+)$/ ) {
   }
 }
 
+warn $action;
+
 unless ( $nologin_actions{$action} ) {
 
   my %cookies = CGI::Cookie->fetch;
@@ -1062,7 +1064,7 @@ sub do_template {
   my $timeout = $access_info->{'timeout'} || '60';
   my $cookie = CGI::Cookie->new('-name'     => 'session',
                                 '-value'    => $session_id,
-                                '-expires'  => '+'.$timeout,
+                                '-expires'  => '+'.$timeout.'s',
                                 #'-secure'   => 1, # would be a good idea...
                                );
   if ( $name eq 'logout' ) {
-- 
2.11.0