diff options
| author | Janos Guljas <janos@resenje.org> | 2017-12-13 17:23:11 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2017-12-13 17:40:39 +0800 |
| commit | 19982f946735948478b6b7e7706f1b615f171d0d (patch) | |
| tree | cbacbdb6f9e6e731c2ebc17bad74e875f4d8ea8b /cmd/puppeth/ssh.go | |
| parent | 1dc19de5da64962a98a37bbc7b93a3895d2eb6e6 (diff) | |
| parent | 32516c768ec09e2a71cab5983d2c8b8ae5d92fc7 (diff) | |
| download | dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.gz dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.bz2 dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.lz dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.xz dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.zst dexon-19982f946735948478b6b7e7706f1b615f171d0d.zip | |
swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Merge with changes that implement config file PR #15548.
Field *EnsApi string* in swarm/api.Config is replaced with
*EnsAPIs []string*.
A new field *EnsDisabled bool* is added to swarm/api.Config for
easy way to disable ENS resolving with config file.
Signature of function swarm.NewSwarm is changed and simplified.
Diffstat (limited to 'cmd/puppeth/ssh.go')
| -rw-r--r-- | cmd/puppeth/ssh.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index ec6a1b669..158261ce0 100644 --- a/cmd/puppeth/ssh.go +++ b/cmd/puppeth/ssh.go @@ -116,6 +116,7 @@ func dial(server string, pubkey []byte) (*sshClient, error) { keycheck := func(hostname string, remote net.Addr, key ssh.PublicKey) error { // If no public key is known for SSH, ask the user to confirm if pubkey == nil { + fmt.Println() fmt.Printf("The authenticity of host '%s (%s)' can't be established.\n", hostname, remote) fmt.Printf("SSH key fingerprint is %s [MD5]\n", ssh.FingerprintLegacyMD5(key)) fmt.Printf("Are you sure you want to continue connecting (yes/no)? ") @@ -215,8 +216,8 @@ func (client *sshClient) Stream(cmd string) error { return session.Run(cmd) } -// Upload copied the set of files to a remote server via SCP, creating any non- -// existing folder in te mean time. +// Upload copies the set of files to a remote server via SCP, creating any non- +// existing folders in the mean time. func (client *sshClient) Upload(files map[string][]byte) ([]byte, error) { // Establish a single command session session, err := client.client.NewSession() |