5 files changed, 16 insertions, 9 deletions
diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go
index 31f8d4400..a07e694de 100644
--- a/cmd/geth/admin.go
+++ b/cmd/geth/admin.go
@@ -25,7 +25,7 @@ func (js *jsre) adminBindings() {
 	js.re.Set("admin", struct{}{})
 	t, _ := js.re.Get("admin")
 	admin := t.Object()
-	admin.Set("suggestPeer", js.suggestPeer)
+	admin.Set("trustPeer", js.trustPeer)
 	admin.Set("startRPC", js.startRPC)
 	admin.Set("stopRPC", js.stopRPC)
 	admin.Set("nodeInfo", js.nodeInfo)
@@ -243,13 +243,13 @@ func (js *jsre) stopRPC(call otto.FunctionCall) otto.Value {
 	return otto.FalseValue()
 }
 
-func (js *jsre) suggestPeer(call otto.FunctionCall) otto.Value {
+func (js *jsre) trustPeer(call otto.FunctionCall) otto.Value {
 	nodeURL, err := call.Argument(0).ToString()
 	if err != nil {
 		fmt.Println(err)
 		return otto.FalseValue()
 	}
-	err = js.ethereum.SuggestPeer(nodeURL)
+	err = js.ethereum.TrustPeer(nodeURL)
 	if err != nil {
 		fmt.Println(err)
 		return otto.FalseValue()
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index ef007051c..d9d1c1b15 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -232,7 +232,8 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
 		utils.IdentityFlag,
 		utils.UnlockedAccountFlag,
 		utils.PasswordFileFlag,
-		utils.BootnodesFlag,
+		utils.BootNodesFlag,
+		utils.TrustedNodesFlag,
 		utils.DataDirFlag,
 		utils.BlockchainVersionFlag,
 		utils.JSpathFlag,
diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index 1030d6ada..18fb919b4 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -69,7 +69,7 @@ func init() {
 		assetPathFlag,
 		rpcCorsFlag,
 
-		utils.BootnodesFlag,
+		utils.BootNodesFlag,
 		utils.DataDirFlag,
 		utils.ListenPortFlag,
 		utils.LogFileFlag,
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go
index 34ce56e77..e1a3aa254 100644
--- a/cmd/mist/ui_lib.go
+++ b/cmd/mist/ui_lib.go
@@ -104,8 +104,8 @@ func (ui *UiLib) Connect(button qml.Object) {
 }
 
 func (ui *UiLib) ConnectToPeer(nodeURL string) {
-	if err := ui.eth.SuggestPeer(nodeURL); err != nil {
-		guilogger.Infoln("SuggestPeer error: " + err.Error())
+	if err := ui.eth.TrustPeer(nodeURL); err != nil {
+		guilogger.Infoln("TrustPeer error: " + err.Error())
 	}
 }
 
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index c013510d8..f52bfc21f 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -202,11 +202,16 @@ var (
 		Usage: "Network listening port",
 		Value: 30303,
 	}
-	BootnodesFlag = cli.StringFlag{
+	BootNodesFlag = cli.StringFlag{
 		Name:  "bootnodes",
 		Usage: "Space-separated enode URLs for p2p discovery bootstrap",
 		Value: "",
 	}
+	TrustedNodesFlag = cli.StringFlag{
+		Name:  "trustednodes",
+		Usage: "List of trusted nodes (either an enode list or path to a json file of enodes)",
+		Value: "",
+	}
 	NodeKeyFileFlag = cli.StringFlag{
 		Name:  "nodekey",
 		Usage: "P2P node key file",
@@ -292,7 +297,8 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
 		NodeKey:            GetNodeKey(ctx),
 		Shh:                ctx.GlobalBool(WhisperEnabledFlag.Name),
 		Dial:               true,
-		BootNodes:          ctx.GlobalString(BootnodesFlag.Name),
+		BootNodes:          ctx.GlobalString(BootNodesFlag.Name),
+		TrustedNodes:       ctx.GlobalString(TrustedNodesFlag.Name),
 	}
 }