Only append the UserKnownHostsFile ssh flag when required #4674
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The merge conflicts were caused by my other PR #4673 I'll fix them up and rebase. |
Crazybus
force-pushed
the
dont_touch_my_ssh
branch
from
3662f5e
to
8f3d2d1
Compare
Don't set a default value for the UserKnownHostsFile flag. Only append `-o UserKnownHostsFile` to the ssh command if it has been specified by the user or vault ssh has set it based on another flag (such as flagHostKeyMountPoint) Fixes hashicorp#4672
Crazybus
force-pushed
the
dont_touch_my_ssh
branch
from
8f3d2d1
to
92c398b
Compare
|
@jefferai merge conflict has been resolved. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Don't set a default value for the UserKnownHostsFile flag.
Only append
-o UserKnownHostsFileto the ssh command if it has been specified by the user or vault ssh has set it based on another flag (such as flagHostKeyMountPoint)Fixes #4672