From 31a725a8faeb0d9a30ecb6090ce92119498416f0 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 17 Jul 2018 10:52:44 -0400 Subject: [PATCH] Fix context shadowing during radius login Fixes #4938 --- builtin/credential/radius/path_login.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/credential/radius/path_login.go b/builtin/credential/radius/path_login.go index 66f5b19e7e2c..68e679908682 100644 --- a/builtin/credential/radius/path_login.go +++ b/builtin/credential/radius/path_login.go @@ -151,8 +151,8 @@ func (b *backend) RadiusLogin(ctx context.Context, req *logical.Request, usernam Timeout: time.Duration(cfg.DialTimeout) * time.Second, }, } - ctx, cancelFunc := context.WithTimeout(context.Background(), time.Duration(cfg.ReadTimeout)*time.Second) - received, err := client.Exchange(ctx, packet, hostport) + clientCtx, cancelFunc := context.WithTimeout(ctx, time.Duration(cfg.ReadTimeout)*time.Second) + received, err := client.Exchange(clientCtx, packet, hostport) cancelFunc() if err != nil { return nil, logical.ErrorResponse(err.Error()), nil