summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/acquire.cc12
-rwxr-xr-xdebian/apt.postinst5
2 files changed, 10 insertions, 7 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 1aa709381..033fa9bd3 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -86,8 +86,16 @@ static bool SetupAPTPartialDirectory(std::string const &grand, std::string const
std::string SandboxUser = _config->Find("APT::Sandbox::User");
struct passwd *pw = getpwnam(SandboxUser.c_str());
struct group *gr = getgrnam("root");
- if (pw != NULL && gr != NULL && chown(partial.c_str(), pw->pw_uid, gr->gr_gid) != 0)
- _error->WarningE("SetupAPTPartialDirectory", "chown to %s:root of directory %s failed", SandboxUser.c_str(), partial.c_str());
+ if (pw != NULL && gr != NULL)
+ {
+ // chown the partial dir
+ if(chown(partial.c_str(), pw->pw_uid, gr->gr_gid) != 0)
+ _error->WarningE("SetupAPTPartialDirectory", "chown to %s:root of directory %s failed", SandboxUser.c_str(), partial.c_str());
+ // chown the auth.conf file
+ std::string AuthConf = _config->FindFile("Dir::Etc::netrc");
+ if(chown(AuthConf.c_str(), pw->pw_uid, gr->gr_gid) != 0)
+ _error->WarningE("SetupAPTPartialDirectory", "chown to %s:root of file %s failed", SandboxUser.c_str(), AuthConf.c_str());
+ }
}
if (chmod(partial.c_str(), 0700) != 0)
_error->WarningE("SetupAPTPartialDirectory", "chmod 0700 of directory %s failed", partial.c_str());
diff --git a/debian/apt.postinst b/debian/apt.postinst
index bcc18b4e5..b0a5da7d8 100755
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -43,11 +43,6 @@ case "$1" in
adduser --force-badname --system -home /var/empty \
--no-create-home --quiet _apt || true
- # ensure the passwords can still be read by the methods
- if [ -e /etc/apt/auth.conf ]; then
- chown _apt:root /etc/apt/auth.conf
- fi
-
# deal with upgrades from experimental
if dpkg --compare-versions "$2" 'eq' '1.1~exp3'; then
# libapt will setup partial/ at runtime