mirrors_public/schollz_croc
0
0
Fork 0
mirror of https://github.com/schollz/croc.git synced 2025-10-11 13:21:00 +02:00
Code Activity

Merge pull request #179 from maximbaz/remember-relay-password-receive

Browse source 
Remember relay password on receive too #177
This commit is contained in:
Zack 2019-11-19 14:00:34 -08:00 • committed by GitHub
commit 3d672d6ac2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/cli/cli.go
View file

@ -171,7 +171,7 @@ func send(c *cli.Context) (err error) {
if !c.IsSet("code") { if !c.IsSet("code") {
crocOptions.SharedSecret = rememberedOptions.SharedSecret crocOptions.SharedSecret = rememberedOptions.SharedSecret
} }
if !c.IsSet("pass") { if !c.GlobalIsSet("pass") {
crocOptions.RelayPassword = rememberedOptions.RelayPassword crocOptions.RelayPassword = rememberedOptions.RelayPassword
} }
} }
@ -334,6 +334,9 @@ func receive(c *cli.Context) (err error) {
if crocOptions.SharedSecret == "" { if crocOptions.SharedSecret == "" {
crocOptions.SharedSecret = rememberedOptions.SharedSecret crocOptions.SharedSecret = rememberedOptions.SharedSecret
} }
if !c.GlobalIsSet("pass") {
crocOptions.RelayPassword = rememberedOptions.RelayPassword
}
} }
if crocOptions.SharedSecret == "" { if crocOptions.SharedSecret == "" {