Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v diff -u -N -r1.114 -r1.115 --- openacs-4/packages/acs-tcl/tcl/security-procs.tcl 25 Nov 2018 17:25:07 -0000 1.114 +++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl 25 Nov 2018 17:34:55 -0000 1.115 @@ -280,7 +280,7 @@ set account_status closed # check for permanent login cookie - catch { + try { lassign [sec_login_read_cookie] untrusted_user_id login_expr auth_token set auth_level expired @@ -307,6 +307,12 @@ set auth_level none set account_status "closed" } + } trap {AD_EXCEPTION NO_COOKIE} {errorMsg} { + # + # There is no such such cookie, no error to report. + # + } on error {errorMsg} { + ns_log error "sec_login_handler: $errorMsg, $::errorCode" } sec_setup_session $untrusted_user_id $auth_level $account_status @@ -1143,7 +1149,7 @@ set cookie_value [ad_get_cookie -include_set_cookies $include_set_cookies $name] if { $cookie_value eq "" } { - error "Cookie does not exist." + throw {AD_EXCEPTION NO_COOKIE} {Cookie does not exist} } lassign $cookie_value value signature @@ -1173,9 +1179,8 @@ } { set cookie_value [ad_get_cookie -include_set_cookies $include_set_cookies $name] - if { $cookie_value eq "" } { - error "Cookie does not exist." + throw {AD_EXCEPTION NO_COOKIE} {Cookie does not exist} } lassign $cookie_value value signature