From bc17f2f759b5c40ee1a7f5de064b4a9f622f6b19 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 11 Dec 2015 05:02:33 -0500 Subject: [PATCH] #2147 fix rewrites authorized_keys when builtin SSH server is enabled --- models/{publickey.go => ssh_key.go} | 10 ++++++++++ 1 file changed, 10 insertions(+) rename models/{publickey.go => ssh_key.go} (98%) diff --git a/models/publickey.go b/models/ssh_key.go similarity index 98% rename from models/publickey.go rename to 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 {