DropPrivs: Move the re-set uid/gid thing to the end of the function

[apt.git] / methods / https.cc

diff --git a/methods/https.cc b/methods/https.cc
index e0348ab58f7fd36b96e8c140f4eaf2bd31ff0cf1..a74d2a38be4ba416ee7f1bfffbc1fdc3e43a9e0a 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -20,6 +20,7 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/strutl.h>

+#include <apt-pkg/proxy.h>

 
 #include <sys/stat.h>
 #include <sys/time.h>
 
 #include <sys/stat.h>
 #include <sys/time.h>


@@ -107,6 +108,9 @@ void HttpsMethod::SetupProxy()                                      /*{{{*/
 {
    URI ServerName = Queue->Uri;
 
 {
    URI ServerName = Queue->Uri;
 

+   // Determine the proxy setting
+   AutoDetectProxy(ServerName);
+

    // Curl should never read proxy settings from the environment, as
    // we determine which proxy to use.  Do this for consistency among
    // methods and prevent an environment variable overriding a
    // Curl should never read proxy settings from the environment, as
    // we determine which proxy to use.  Do this for consistency among
    // methods and prevent an environment variable overriding a


@@ -442,6 +446,8 @@ int main()
    HttpsMethod Mth;
    curl_global_init(CURL_GLOBAL_SSL) ;
 
    HttpsMethod Mth;
    curl_global_init(CURL_GLOBAL_SSL) ;
 

+   Mth.DropPrivsOrDie();
+

    return Mth.Run();
 }
 
    return Mth.Run();
 }