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

   PR_SET_DUMPABLE, so adjust ifdef; reported by Tom Christensen

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a80c2a6..5d19ca63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 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
  - (djm) [sshd.c] Ignore SIGXFSZ in preauth monitor child; can explode on
    lastlog writing on platforms with high UIDs; bz#2263
  - (djm) [configure.ac] We now require a working vsnprintf everywhere (not
diff --git a/sftp-server.c b/sftp-server.c
index 77834117..0177130c 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1526,7 +1526,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
 
 	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}
 	 * 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)
 		fatal("unable to make the process undumpable");
-#endif
+#endif /* defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE) */
 
 	if ((cp = getenv("SSH_CONNECTION")) != NULL) {
 		client_addr = xstrdup(cp);