eipp: add Allow-Temporary-Remove-of-Essentials

[apt.git] / methods / rsh.cc

diff --git a/methods/rsh.cc b/methods/rsh.cc
index 9d82a99e3dd8aa2e366bebec11ce87d7346b8fd8..74a908ef7f2647e3668e8af6203270fc4c3025f8 100644 (file)
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -17,7 +17,6 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/strutl.h>
 
 #include <stdlib.h>
 #include <apt-pkg/strutl.h>
 
 #include <stdlib.h>


@@ -398,6 +397,10 @@ RSHMethod::RSHMethod(std::string const &pProg) : aptMethod(pProg.c_str(),"1.0",S
 // ---------------------------------------------------------------------
 bool RSHMethod::Configuration(std::string Message)
 {
 // ---------------------------------------------------------------------
 bool RSHMethod::Configuration(std::string Message)
 {

+   // enabling privilege dropping for this method requires configuration…
+   // … which is otherwise lifted straight from root, so use it by default.
+   _config->Set(std::string("Binary::") + Prog + "::APT::Sandbox::User", "");
+

    if (aptMethod::Configuration(Message) == false)
       return false;
 
    if (aptMethod::Configuration(Message) == false)
       return false;
 


@@ -543,8 +546,5 @@ bool RSHMethod::Fetch(FetchItem *Itm)
 
 int main(int, const char *argv[])
 {
 
 int main(int, const char *argv[])
 {

-   setlocale(LC_ALL, "");
-
-   RSHMethod Mth(flNotDir(argv[0]));
-   return Mth.Run();
+   return RSHMethod(flNotDir(argv[0])).Run();

 }
 }