Skip to content

Skip appending authorized_keys file if asked not to #13368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
techknowlogick merged 4 commits into from
Nov 1, 2020
Merged

Skip appending authorized_keys file if asked not to #13368

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4425c01
don't append key file if asked not to
sapk Oct 31, 2020
7e3ba69
Merge branch 'master' into force-create-auth-key
sapk Oct 31, 2020
bee4440
Merge branch 'master' into force-create-auth-key
sapk Oct 31, 2020
2390e5a
Merge branch 'master' into force-create-auth-key
sapk Oct 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion models/ssh_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ func CheckPublicKeyString(content string) (_ string, err error) {
// appendAuthorizedKeysToFile appends new SSH keys' content to authorized_keys file.
func appendAuthorizedKeysToFile(keys ...*PublicKey) error {
// Don't need to rewrite this file if builtin SSH server is enabled.
if setting.SSH.StartBuiltinServer {
if setting.SSH.StartBuiltinServer || !setting.SSH.CreateAuthorizedKeysFile {
return nil
}

Expand Down