From 25845a39d3dbf470b192b49b22f01a6618f14b14 Mon Sep 17 00:00:00 2001
From: Ryan Uber <ru@ryanuber.com>
Date: Thu, 2 Oct 2014 18:03:05 -0700
Subject: [PATCH] consul: detach executeKeyringOp() from *Internal

---
 consul/internal_endpoint.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/consul/internal_endpoint.go b/consul/internal_endpoint.go
index f9bed288ca..50109f88d3 100644
--- a/consul/internal_endpoint.go
+++ b/consul/internal_endpoint.go
@@ -81,11 +81,11 @@ func (m *Internal) KeyringOperation(
 
 	dc := m.srv.config.Datacenter
 
-	respLAN, err := m.doKeyringOperation(args, m.srv.KeyManagerLAN())
+	respLAN, err := executeKeyringOp(args, m.srv.KeyManagerLAN())
 	ingestKeyringResponse(respLAN, reply, dc, false, err)
 
 	if !args.Forwarded {
-		respWAN, err := m.doKeyringOperation(args, m.srv.KeyManagerWAN())
+		respWAN, err := executeKeyringOp(args, m.srv.KeyManagerWAN())
 		ingestKeyringResponse(respWAN, reply, dc, true, err)
 
 		args.Forwarded = true
@@ -95,7 +95,10 @@ func (m *Internal) KeyringOperation(
 	return nil
 }
 
-func (m *Internal) doKeyringOperation(
+// executeKeyringOp executes the appropriate keyring-related function based on
+// the type of keyring operation in the request. It takes the KeyManager as an
+// argument, so it can handle any operation for either LAN or WAN pools.
+func executeKeyringOp(
 	args *structs.KeyringRequest,
 	mgr *serf.KeyManager) (r *serf.KeyResponse, err error) {