From 9983999d294887046abf386adc31190700d89b61 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Mon, 13 Oct 2014 10:57:30 +0200
Subject: Fix backward compatiblity of the new
 pkgAcquireMethod::DropPrivsOrDie()

Do not drop privileges in the methods when using a older version of
libapt that does not support the chown magic in partial/ yet. To
do this DropPrivileges() now will ignore a empty Apt::Sandbox::User.

Cleanup all hardcoded _apt along the way.
---
 methods/http.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'methods/http.cc')

diff --git a/methods/http.cc b/methods/http.cc
index c00b439b7..a5de13511 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -770,6 +770,8 @@ bool HttpMethod::Configuration(string Message)
    if (ServerMethod::Configuration(Message) == false)
       return false;
 
+   DropPrivsOrDie();
+
    AllowRedirect = _config->FindB("Acquire::http::AllowRedirect",true);
    PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",
 				  PipelineDepth);
-- 
cgit v1.2.3