View | Details | Raw Unified | Return to bug 6335
Collapse All | Expand All

(-)a/C4/SIP/Sip/MsgType.pm (-13 / +12 lines)
Lines 817-823 sub login_core ($$$) { Link Here
817
		$server->{sip_username} = $uid;
817
		$server->{sip_username} = $uid;
818
		$server->{sip_password} = $pwd;
818
		$server->{sip_password} = $pwd;
819
819
820
		my $auth_status = api_auth($uid,$pwd);
820
		my $auth_status = api_auth($uid,$pwd,$inst);
821
		if (!$auth_status or $auth_status !~ /^ok$/i) {
821
		if (!$auth_status or $auth_status !~ /^ok$/i) {
822
			syslog("LOG_WARNING", "api_auth failed for SIP terminal '%s' of '%s': %s",
822
			syslog("LOG_WARNING", "api_auth failed for SIP terminal '%s' of '%s': %s",
823
						$uid, $inst, ($auth_status||'unknown'));
823
						$uid, $inst, ($auth_status||'unknown'));
Lines 1585-1601 sub patron_status_string { Link Here
1585
    return $patron_status;
1585
    return $patron_status;
1586
}
1586
}
1587
1587
1588
sub api_auth($$) {
1588
sub api_auth {
1589
	# AUTH
1589
    my ($username,$password, $branch) = @_;
1590
	my ($username,$password) = (shift,shift);
1590
    $ENV{REMOTE_USER} = $username;
1591
	$ENV{REMOTE_USER} = $username;
1591
    my $query = CGI->new();
1592
	my $query = CGI->new();
1592
    $query->param(userid   => $username);
1593
	$query->param(userid   => $username);
1593
    $query->param(password => $password);
1594
	$query->param(password => $password);
1594
    if ($branch) {
1595
	my ($status, $cookie, $sessionID) = check_api_auth($query, {circulate=>1}, "intranet");
1595
        $query->param(branch => $branch);
1596
	# print STDERR "check_api_auth returns " . ($status || 'undef') . "\n";
1596
    }
1597
	# print "api_auth userenv = " . &dump_userenv;
1597
    my ($status, $cookie, $sessionID) = check_api_auth($query, {circulate=>1}, 'intranet');
1598
	return $status;
1598
    return $status;
1599
}
1599
}
1600
1600
1601
1;
1601
1;
1602
- 

Return to bug 6335