Merge pull request #40576 from thaJeztah/rootless_remove_unneeded_permission_exception

Revert "Don't die when daemon cannot read certs.d"
This commit is contained in:
Brian Goff 2020-02-27 11:22:52 -08:00 committed by GitHub
commit e08e7c6d11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -69,7 +69,7 @@ func hasFile(files []os.FileInfo, name string) bool {
// provided TLS configuration.
func ReadCertsDirectory(tlsConfig *tls.Config, directory string) error {
fs, err := ioutil.ReadDir(directory)
if err != nil && !os.IsNotExist(err) && !os.IsPermission(err) {
if err != nil && !os.IsNotExist(err) {
return err
}