- (djm) [sftp-server.c] Some systems (e.g. Irix) have prctl() but not

PR_SET_DUMPABLE, so adjust ifdef; reported by Tom Christensen
This commit is contained in:
Damien Miller 2014-08-24 03:01:06 +10:00
parent d244a5816f
commit 9c1dede005
2 changed files with 6 additions and 2 deletions

View File

@ -1,3 +1,7 @@
20140823
- (djm) [sftp-server.c] Some systems (e.g. Irix) have prctl() but not
PR_SET_DUMPABLE, so adjust ifdef; reported by Tom Christensen
20140823 20140823
- (djm) [sshd.c] Ignore SIGXFSZ in preauth monitor child; can explode on - (djm) [sshd.c] Ignore SIGXFSZ in preauth monitor child; can explode on
lastlog writing on platforms with high UIDs; bz#2263 lastlog writing on platforms with high UIDs; bz#2263

View File

@ -1526,7 +1526,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
log_init(__progname, log_level, log_facility, log_stderr); log_init(__progname, log_level, log_facility, log_stderr);
#ifdef HAVE_PRCTL #if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
/* /*
* On Linux, we should try to avoid making /proc/self/{mem,maps} * On Linux, we should try to avoid making /proc/self/{mem,maps}
* available to the user so that sftp access doesn't automatically * 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)
*/ */
if (prctl(PR_SET_DUMPABLE, 0) != 0) if (prctl(PR_SET_DUMPABLE, 0) != 0)
fatal("unable to make the process undumpable"); fatal("unable to make the process undumpable");
#endif #endif /* defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE) */
if ((cp = getenv("SSH_CONNECTION")) != NULL) { if ((cp = getenv("SSH_CONNECTION")) != NULL) {
client_addr = xstrdup(cp); client_addr = xstrdup(cp);