Merge branch 'debian/sid' into debian/experimental

[apt.git] / cmdline / apt-dump-solver.cc

diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc
index e82e15c6e3a5c6c791d42f8b6baffb17f80a06ae..424764b3c35c5461e9ec3f8bf963f3a91480b0b6 100644 (file)
--- a/cmdline/apt-dump-solver.cc
+++ b/cmdline/apt-dump-solver.cc
@@ -9,19 +9,21 @@
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/edsp.h>
 
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/edsp.h>
 

-#include <config.h>
-
+#include <string.h>
+#include <unistd.h>

 #include <cstdio>
 #include <iostream>
 #include <cstdio>
 #include <iostream>

+
+#include <config.h>

                                                                        /*}}}*/
 
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
                                                                        /*}}}*/
 
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool ShowHelp() {
+static bool ShowHelp() {

 
        std::cout <<
 
        std::cout <<

-               PACKAGE " " VERSION " for " COMMON_ARCH " compiled on " __DATE__ " " __TIME__ << std::endl <<
+               PACKAGE " " PACKAGE_VERSION " for " COMMON_ARCH " compiled on " __DATE__ " " __TIME__ << std::endl <<

                "Usage: apt-dump-resolver\n"
                "\n"
                "apt-dump-resolver is a dummy solver who just dumps its input to the\n"
                "Usage: apt-dump-resolver\n"
                "\n"
                "apt-dump-resolver is a dummy solver who just dumps its input to the\n"


@@ -38,6 +40,8 @@ int main(int argc,const char *argv[])                                 /*{{{*/
                ShowHelp();
                return 0;
        }
                ShowHelp();
                return 0;
        }

+        // we really don't need anything
+        DropPrivs();

 
        FILE* input = fdopen(STDIN_FILENO, "r");
        FILE* output = fopen("/tmp/dump.edsp", "w");
 
        FILE* input = fdopen(STDIN_FILENO, "r");
        FILE* output = fopen("/tmp/dump.edsp", "w");