From 0a233442bd5a803b47e7f395fdb1d1d079cbc609 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Thu, 17 Oct 2013 15:29:00 -0700 Subject: [PATCH] Bug 11077: Remove useless unititialized variable warning. During login at the Staff interface you get warnings in the logs regarding an uninitialized value for the $pki_field variable. To test: - tail -f /path/to/your-intranet-logs - Point your browser to your staff login page - Login - Three warnings are showed - Apply the patch - Log out - Log in - No new warnings, and you can still log in. Thanks To+ Sponsored-by: Universidad Nacional de Cordoba --- C4/Auth.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index d73edaf..4e4a82f 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -682,7 +682,8 @@ sub checkauth { $userid = $session->param('id'); $sessiontype = $session->param('sessiontype') || ''; } - if ( ( ($query->param('koha_login_context')) && ($query->param('userid') ne $session->param('id')) ) + if ( ( $query->param('koha_login_context') && + ( $query->param('userid') ne ( $session->param('id') // '' ) ) ) || ( $cas && $query->param('ticket') ) ) { #if a user enters an id ne to the id in the current session, we need to log them in... #first we need to clear the anonymous session... @@ -793,10 +794,11 @@ sub checkauth { } elsif ( + defined $pki_field && ( ( $pki_field eq 'Common Name' && $ENV{'SSL_CLIENT_S_DN_CN'} ) || ( $pki_field eq 'emailAddress' && $ENV{'SSL_CLIENT_S_DN_Email'} ) - ) + ) ) { my $value; if ( $pki_field eq 'Common Name' ) { -- 1.8.3.2