use apt-key to wrap gpg calls in testcases

[apt.git] / apt-pkg / contrib / fileutl.cc

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 6b54c81f9b6c0a5e87f0c41a16890d62d90a8087..9e77020636f4ab5987370d68529800ff7820526e 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -896,7 +896,7 @@ class FileFdPrivate {                                                       /*{{{*/
           bool eof;
           bool compressing;
 
-          LZMAFILE() : file(NULL), eof(false), compressing(false) {}
+          LZMAFILE() : file(NULL), eof(false), compressing(false) { buffer[0] = '\0'; }
           ~LZMAFILE() {
              if (compressing == true)
              {
@@ -2184,10 +2184,10 @@ bool DropPrivs()
    if(_config->FindB("Debug::NoDropPrivs", false) == true)
       return true;
 
-   const std::string nobody = _config->Find("APT::User::Nobody", "_apt");
-   struct passwd *pw = getpwnam(nobody.c_str());
+   const std::string toUser = _config->Find("APT::Sandbox::User", "_apt");
+   struct passwd *pw = getpwnam(toUser.c_str());
    if (pw == NULL)
-      return _error->Warning("No user %s, can not drop rights", nobody.c_str());
+      return _error->Error("No user %s, can not drop rights", toUser.c_str());
 
 #if __gnu_linux__
    // see prctl(2), needs linux3.5
@@ -2231,6 +2231,7 @@ bool DropPrivs()
       return _error->Error("Could not switch effective user");
 
 #ifdef HAVE_GETRESUID
+   // verify that the saved set-user-id was changed as well
    uid_t ruid = 0;
    uid_t euid = 0;
    uid_t suid = 0;
@@ -2241,6 +2242,7 @@ bool DropPrivs()
 #endif
 
 #ifdef HAVE_GETRESGID
+   // verify that the saved set-group-id was changed as well
    gid_t rgid = 0;
    gid_t egid = 0;
    gid_t sgid = 0;