Re-add some functionality lost during last dep update (#3636)

hashicorp · Dec 1, 2017 · eed4579 · eed4579
1 parent c2cef87
commit eed4579
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/builtin/credential/radius/path_config.go b/builtin/credential/radius/path_config.go
@@ -39,7 +39,7 @@ func pathConfig(b *backend) *framework.Path {
 			"read_timeout": &framework.FieldSchema{
 				Type:        framework.TypeDurationSecond,
 				Default:     10,
-				Description: "Number of seconds before response times out (default: 10). Note: kept for backwards compatibility, currently unused.",
+				Description: "Number of seconds before response times out (default: 10)",
 			},
 			"nas_port": &framework.FieldSchema{
 				Type:        framework.TypeInt,

diff --git a/builtin/credential/radius/path_login.go b/builtin/credential/radius/path_login.go
@@ -154,7 +154,9 @@ func (b *backend) RadiusLogin(req *logical.Request, username string, password st
 			Timeout: time.Duration(cfg.DialTimeout) * time.Second,
 		},
 	}
-	received, err := client.Exchange(context.Background(), packet, hostport)
+	ctx, cancelFunc := context.WithTimeout(context.Background(), time.Duration(cfg.ReadTimeout)*time.Second)
+	received, err := client.Exchange(ctx, packet, hostport)
+	cancelFunc()
 	if err != nil {
 		return nil, logical.ErrorResponse(err.Error()), nil
 	}