From 2016b650e2a7691f578a59f2ac4b2c852149278b Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Thu, 23 May 2024 08:47:50 +0000
Subject: [PATCH] Bug 36940: Resolve two warnings on undefined branchip

If you enabled AutoLocation and have a branch without ip, this
triggers warnings.

Test plan:
Check logs in this situation with/without this patch by logging out
and in again on staff.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 2f1ffbc6ec088c6c18bad967086db1e51084403f)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 2d4537ba124d40201a4a0d164e714479474749ce)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 C4/Auth.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 42baea8321..7bd2b7bfd0 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -1199,10 +1199,10 @@ sub checkauth {
                         my $branches = { map { $_->branchcode => $_->unblessed } Koha::Libraries->search->as_list };
                         if ( C4::Context->preference('AutoLocation') ) {
                             # we have to check they are coming from the right ip range
-                            my $domain = $branches->{$branchcode}->{'branchip'};
+                            my $domain = $branches->{$branchcode}->{'branchip'} // q{};
                             $domain =~ s|\.\*||g;
                             $domain =~ s/\s+//g;
-                            if ( $ip !~ /^$domain/ ) {
+                            if ( $domain && $ip !~ /^$domain/ ) {
                                 $cookie = $cookie_mgr->replace_in_list( $cookie, $query->cookie(
                                     -name     => 'CGISESSID',
                                     -value    => '',
-- 
2.39.5