projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 3.1.0
[debian/amanda]
/
common-src
/
ssh-security.c
diff --git
a/common-src/ssh-security.c
b/common-src/ssh-security.c
index 229c4b40811b1d36ee3b36c88f2c7cd3286ab258..19d60692792725905a82e3e4465555201db8fa1c 100644
(file)
--- a/
common-src/ssh-security.c
+++ b/
common-src/ssh-security.c
@@
-37,11
+37,9
@@
#include "util.h"
#include "event.h"
#include "packet.h"
#include "util.h"
#include "event.h"
#include "packet.h"
-#include "queue.h"
#include "security.h"
#include "security-util.h"
#include "stream.h"
#include "security.h"
#include "security-util.h"
#include "stream.h"
-#include "version.h"
/*
* Number of seconds ssh has to start up
/*
* Number of seconds ssh has to start up
@@
-225,11
+223,13
@@
runssh(
return (0);
}
return (0);
}
+ /* drop root privs for good */
+ set_root_privs(-1);
+
safe_fd(-1, 0);
if(!xamandad_path || strlen(xamandad_path) <= 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);
if(!xclient_username || strlen(xclient_username) <= 1)
xclient_username = CLIENT_LOGIN;
if(!ssh_keys || strlen(ssh_keys) <= 1) {
if(!xclient_username || strlen(xclient_username) <= 1)
xclient_username = CLIENT_LOGIN;
if(!ssh_keys || strlen(ssh_keys) <= 1) {