diff options
author | Damien Miller <djm@mindrot.org> | 2014-08-24 03:01:06 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-08-24 03:01:06 +1000 |
commit | 9c1dede005746864a4fdb36a7cdf6c51296ca909 (patch) | |
tree | 0fdd9ca2bab2acec1b9652a470e4ca254396ca7c /sftp-server.c | |
parent | d244a5816fd1312a33404b436e4dd83594f1119e (diff) |
- (djm) [sftp-server.c] Some systems (e.g. Irix) have prctl() but not
PR_SET_DUMPABLE, so adjust ifdef; reported by Tom Christensen
Diffstat (limited to 'sftp-server.c')
-rw-r--r-- | sftp-server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sftp-server.c b/sftp-server.c index 77834117c..0177130cf 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
@@ -1526,7 +1526,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) | |||
1526 | 1526 | ||
1527 | log_init(__progname, log_level, log_facility, log_stderr); | 1527 | log_init(__progname, log_level, log_facility, log_stderr); |
1528 | 1528 | ||
1529 | #ifdef HAVE_PRCTL | 1529 | #if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE) |
1530 | /* | 1530 | /* |
1531 | * On Linux, we should try to avoid making /proc/self/{mem,maps} | 1531 | * On Linux, we should try to avoid making /proc/self/{mem,maps} |
1532 | * available to the user so that sftp access doesn't automatically | 1532 | * available to the user so that sftp access doesn't automatically |
@@ -1535,7 +1535,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) | |||
1535 | */ | 1535 | */ |
1536 | if (prctl(PR_SET_DUMPABLE, 0) != 0) | 1536 | if (prctl(PR_SET_DUMPABLE, 0) != 0) |
1537 | fatal("unable to make the process undumpable"); | 1537 | fatal("unable to make the process undumpable"); |
1538 | #endif | 1538 | #endif /* defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE) */ |
1539 | 1539 | ||
1540 | if ((cp = getenv("SSH_CONNECTION")) != NULL) { | 1540 | if ((cp = getenv("SSH_CONNECTION")) != NULL) { |
1541 | client_addr = xstrdup(cp); | 1541 | client_addr = xstrdup(cp); |