From: Julian Andres Klode <jak@debian.org>
Date: Wed, 24 Sep 2014 15:29:53 +0000 (+0200)
Subject: Use _apt as our unprivileged user name
X-Git-Tag: 1.1.exp3~10
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/eed65c79322c3c79facdea44ce39033b21972e36?hp=5f2047ece8c192d919cd97fea73759ce07b416ce

Use _apt as our unprivileged user name

Some people want to standardize on it, and BSDs do it too, so let's
do the same.

Reported-by: Paul Wise <pabs@debian.org>
---

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 72e2dabd5..8e7313e8f 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -2184,7 +2184,7 @@ bool DropPrivs()
    if(_config->FindB("Debug::NoDropPrivs", false) == true)
       return true;
 
-   const std::string nobody = _config->Find("APT::User::Nobody", "Debian-apt");
+   const std::string nobody = _config->Find("APT::User::Nobody", "_apt");
    struct passwd *pw = getpwnam(nobody.c_str());
    if (pw == NULL)
       return _error->Warning("No user %s, can not drop rights", nobody.c_str());
diff --git a/debian/apt.postinst b/debian/apt.postinst
index 08dc60f9c..fab026504 100644
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -28,8 +28,8 @@ case "$1" in
 
         # add unprivileged user for the apt methods
         adduser --force-badname --system --no-create-home \
-            --quiet Debian-apt || true
-        chown -R Debian-apt:root \
+            --quiet _apt || true
+        chown -R _apt:root \
             /var/lib/apt/lists \
             /var/cache/apt/archives