#2147 fix rewrites authorized_keys when builtin SSH server is enabled

1 files changed, 10 insertions, 0 deletions

diff --git a/models/publickey.go b/models/ssh_key.go
index 6838947814..e213d083c1 100644
--- a/models/publickey.go
+++ b/models/ssh_key.go
@@ -299,6 +299,11 @@ func addKey(e Engine, key *PublicKey) (err error) {
 	if _, err = e.Insert(key); err != nil {
 		return err
 	}
+
+	// Don't need to rewrite this file if builtin SSH server is enabled.
+	if setting.StartSSHServer {
+		return nil
+	}
 	return saveAuthorizedKeyFile(key)
 }
 
@@ -439,6 +444,11 @@ func deletePublicKey(e *xorm.Session, keyID int64) error {
 		return err
 	}
 
+	// Don't need to rewrite this file if builtin SSH server is enabled.
+	if setting.StartSSHServer {
+		return nil
+	}
+
 	fpath := filepath.Join(SSHPath, "authorized_keys")
 	tmpPath := filepath.Join(SSHPath, "authorized_keys.tmp")
 	if err = rewriteAuthorizedKeys(key, fpath, tmpPath); err != nil {