Moved defer f.Close() up so there is no chance of returning without closing and handl...

diff --git a/models/publickey.go b/models/publickey.go
index a03d282c0ad96be65634aa74d886268c5f83eb22..83a3e1b87e97a657247beb813c822a9b33772cf5 100644 (file)
--- a/models/publickey.go
+++ b/models/publickey.go
@@ -155,17 +155,19 @@ func saveAuthorizedKeyFile(key *PublicKey) error {
        if err != nil {
                return err
        }
+       defer f.Close()
        finfo, err := f.Stat()
        if err != nil {
                return err
        }
        if finfo.Mode().Perm() > 0600 {
                log.Error(3, "authorized_keys file has unusual permission flags: %s - setting to -rw-------", finfo.Mode().Perm().String())
-               f.Chmod(0600)
+               err = f.Chmod(0600)
+               if err != nil {
+                       return err
+               }
        }
 
-       defer f.Close()
-
        _, err = f.WriteString(key.GetAuthorizedString())
        return err
 }