From 8617a20446c607916bcaa8f7e69cdfb30230a25a Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 7 Dec 2018 14:19:32 -0500 Subject: [PATCH] LP#1807398 marc_stream/oils_header auth repairs Fixed a few code thinkos in marc stream workstation login support. Signed-off-by: Bill Erickson Signed-off-by: Jason Boyer --- Open-ILS/src/support-scripts/marc_stream_importer.pl | 2 +- Open-ILS/src/support-scripts/oils_header.pl | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Open-ILS/src/support-scripts/marc_stream_importer.pl b/Open-ILS/src/support-scripts/marc_stream_importer.pl index 19e3f4903b..ac46584aca 100755 --- a/Open-ILS/src/support-scripts/marc_stream_importer.pl +++ b/Open-ILS/src/support-scripts/marc_stream_importer.pl @@ -95,7 +95,7 @@ GetOptions( 'verbose' => \$verbose, 'username=s' => \$username, 'password=s' => \$password, - 'workstation' => \$workstation, + 'workstation=s' => \$workstation, 'tempdir=s' => \$tempdir, 'spoolfile=s' => \$spoolfile, 'wait=i' => \$wait_time, diff --git a/Open-ILS/src/support-scripts/oils_header.pl b/Open-ILS/src/support-scripts/oils_header.pl index de9a84fc92..55da43c9cc 100755 --- a/Open-ILS/src/support-scripts/oils_header.pl +++ b/Open-ILS/src/support-scripts/oils_header.pl @@ -151,7 +151,7 @@ sub oils_event_die { # Login to the auth server and set the global $authtoken var #---------------------------------------------------------------- sub oils_login { - my( $username, $password, $type ) = @_; + my( $username, $password, $type, $workstation ) = @_; $type |= "staff"; @@ -160,9 +160,12 @@ sub oils_login { 'open-ils.auth.authenticate.init', $username, $nonce); err("No auth seed") unless $seed; - my $opts = { username => $username, - password => md5_hex($seed . md5_hex($password)), - type => $type }; + my $opts = { + username => $username, + password => md5_hex($seed . md5_hex($password)), + type => $type, + nonce => $nonce + }; if(defined($workstation)) { $opts->{workstation} = $workstation; -- 2.43.2