Imported Upstream version 3.1.0

[debian/amanda] / common-src / local-security.c

diff --git a/common-src/local-security.c b/common-src/local-security.c
index 7e2d1d81845c9fe4bef1a2c8b23729f296c18f93..6a8b8a4da617eabf41e6299444afc4ec82349940 100644 (file)
--- a/common-src/local-security.c
+++ b/common-src/local-security.c
@@ -34,14 +34,13 @@
  */
 
 #include "amanda.h"
+#include "match.h"
 #include "util.h"
 #include "event.h"
 #include "packet.h"
-#include "queue.h"
 #include "security.h"
 #include "security-util.h"
 #include "stream.h"
-#include "version.h"
 
 /*
  * Number of seconds amandad has to start up
@@ -243,11 +242,13 @@ runlocal(
        return (0);
     }
 
+    /* drop root privs for good */
+    set_root_privs(-1);
+
     safe_fd(-1, 0);
 
     if(!xamandad_path || strlen(xamandad_path) <= 1) 
-       xamandad_path = vstralloc(amlibexecdir, "/", "amandad",
-                                versionsuffix(), NULL);
+       xamandad_path = vstralloc(amlibexecdir, "/", "amandad", NULL);
 
 #ifndef SINGLE_USERID
     if (uid != 0)