From 0bee8478a9287533eee5ab3a9fbc6f1151e95495 Mon Sep 17 00:00:00 2001
From: Josh Rickmar <jrick@conformal.com>
Date: Wed, 20 Nov 2013 11:12:00 -0500
Subject: [PATCH] Fix optional arg handling for importprivkey.

---
 util/btcctl/btcctl.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/util/btcctl/btcctl.go b/util/btcctl/btcctl.go
index c3d1c4a0..1438d13c 100644
--- a/util/btcctl/btcctl.go
+++ b/util/btcctl/btcctl.go
@@ -205,17 +205,15 @@ func makeGetRawTransaction(args []interface{}) (btcjson.Cmd, error) {
 // makeImportPrivKey generates the cmd structure for
 // importprivkey commands.
 func makeImportPrivKey(args []interface{}) (btcjson.Cmd, error) {
-	var label string
-	var rescan bool
+	var optargs = make([]interface{}, 0, 2)
 	if len(args) > 1 {
-		label = args[1].(string)
+		optargs = append(optargs, args[1].(string))
 	}
 	if len(args) > 2 {
-		rescan = args[2].(bool)
+		optargs = append(optargs, args[2].(bool))
 	}
 
-	return btcjson.NewImportPrivKeyCmd("btcctl", args[0].(string), label,
-		rescan)
+	return btcjson.NewImportPrivKeyCmd("btcctl", args[0].(string), optargs...)
 }
 
 // makeStop generates the cmd structure for stop comands.