X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/dc021c3b57dcdebe464c148d55f9990a74e8246b..8989c3ca9c63dc05975b2c02e56c2031246beb96:/services/keepstore/proxy_remote.go?ds=sidebyside

diff --git a/services/keepstore/proxy_remote.go b/services/keepstore/proxy_remote.go
index 171dee3c4b..66a7b43751 100644
--- a/services/keepstore/proxy_remote.go
+++ b/services/keepstore/proxy_remote.go
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-package main
+package keepstore
 
 import (
 	"context"
@@ -130,14 +130,14 @@ func (rp *remoteProxy) remoteClient(remoteID string, remoteCluster arvados.Remot
 	}
 	accopy := *kc.Arvados
 	accopy.ApiToken = token
-	kccopy := *kc
+	kccopy := kc.Clone()
 	kccopy.Arvados = &accopy
 	token, err := auth.SaltToken(token, remoteID)
 	if err != nil {
 		return nil, err
 	}
 	kccopy.Arvados.ApiToken = token
-	return &kccopy, nil
+	return kccopy, nil
 }
 
 var localOrRemoteSignature = regexp.MustCompile(`\+[AR][^\+]*`)
@@ -177,7 +177,7 @@ func (rrc *remoteResponseCacher) Close() error {
 		rrc.ResponseWriter.Write(rrc.Buffer)
 		return nil
 	}
-	_, err := PutBlock(rrc.Context, rrc.VolumeManager, rrc.Buffer, rrc.Locator[:32])
+	_, err := PutBlock(rrc.Context, rrc.VolumeManager, rrc.Buffer, rrc.Locator[:32], nil)
 	if rrc.Context.Err() != nil {
 		// If caller hung up, log that instead of subsequent/misleading errors.
 		http.Error(rrc.ResponseWriter, rrc.Context.Err().Error(), http.StatusGatewayTimeout)