From: Peter Amstutz <peter.amstutz@curii.com>
Date: Thu, 3 Sep 2020 18:41:59 +0000 (-0400)
Subject: Merge branch '16689-shell-sync-groups' refs #16689
X-Git-Tag: 2.1.0~83
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/8f8329e7d99e9d1c0e753fb26bf4dc1e76828017

Merge branch '16689-shell-sync-groups' refs #16689

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

8f8329e7d99e9d1c0e753fb26bf4dc1e76828017
diff --cc services/login-sync/bin/arvados-login-sync
index aee911cfc4,9152b29336..8162e22a2f
--- a/services/login-sync/bin/arvados-login-sync
+++ b/services/login-sync/bin/arvados-login-sync
@@@ -174,18 -204,13 +201,17 @@@ begi
      end
  
      FileUtils.chown_R(l[:username], nil, userdotssh)
 -    FileUtils.chown_R(l[:username], nil, configarvados)
 +    FileUtils.chown_R(l[:username], nil, userdotconfig)
      File.chmod(0700, userdotssh)
 +    File.chmod(0700, userdotconfig)
 +    File.chmod(0700, configarvados)
      File.chmod(0750, homedir)
      File.chmod(0600, keysfile)
 -    File.chmod(0700, configarvados)
 +    if File.exist?(tokenfile)
 +      File.chmod(0600, tokenfile)
 +    end
    end
  
-   devnull.close
  rescue Exception => bang
    puts "Error: " + bang.to_s
    puts bang.backtrace.join("\n")