Merge branch 'lp2150631' into 'main'

Warn if auth.conf is unreadable (LP: #2150631)

See merge request apt-team/apt!580

1 files changed, 15 insertions, 0 deletions

diff --git a/methods/aptmethod.h b/methods/aptmethod.h
index f564499f0..9499367c8 100644
--- a/methods/aptmethod.h
+++ b/methods/aptmethod.h
@@ -539,6 +539,9 @@ class aptAuthConfMethod : public aptMethod
 {
    std::vector<std::unique_ptr<FileFd>> authconfs;
 
+   protected:
+   std::vector<std::string> inaccessibleAuthConfs;
+
    public:
    bool Configuration(std::string Message) override
    {
@@ -555,6 +558,12 @@ class aptAuthConfMethod : public aptMethod
       {
 	 authconfs.emplace_back(new FileFd());
 	 authconfs.back()->Open(netrc, FileFd::ReadOnly);
+	 if (authconfs.back()->IsOpen() == false)
+	 {
+	    struct stat st;
+	    if (stat(netrc.c_str(), &st) == 0)
+	       inaccessibleAuthConfs.push_back(netrc);
+	 }
       }
 
       auto const netrcparts = _config->FindDir("Dir::Etc::netrcparts");
@@ -564,6 +573,12 @@ class aptAuthConfMethod : public aptMethod
 	 {
 	    authconfs.emplace_back(new FileFd());
 	    authconfs.back()->Open(netrcpart, FileFd::ReadOnly);
+	    if (authconfs.back()->IsOpen() == false)
+	    {
+	       struct stat st;
+	       if (stat(netrcpart.c_str(), &st) == 0)
+		  inaccessibleAuthConfs.push_back(netrcpart);
+	    }
 	 }
       }
       _error->RevertToStack();