Some older kernels are missing setresuid() and setresgid(), so don't try to

use them. setreuid() and setregid() will do well enough for our purposes
(closes: #239999).

2 files changed, 5 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 3055d3c3c..0c0f9da60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ openssh (1:3.8p1-3) UNRELEASED; urgency=low
     sshd_config files (closes: #239987).
   * Build everything apart from contrib in a subdirectory, to allow for
     multiple builds.
+  * Some older kernels are missing setresuid() and setresgid(), so don't try
+    to use them. setreuid() and setregid() will do well enough for our
+    purposes (closes: #239999).
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 25 Mar 2004 11:29:55 +0000
 
diff --git a/debian/rules b/debian/rules
index c4c08eb0e..8cc9b5d9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,8 @@ build-deb-stamp:
         dh_testdir
         mkdir -p build-deb
         cd build-deb && ../configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin --with-pam --with-4in6 --with-privsep-path=/var/run/sshd  --without-rand-helper
+        # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999).
+        perl -pi -e 's/.*#undef (BROKEN_SETRES[UG]ID).*/#define $$1 1/' build-deb/config.h
         $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -DSSH_VERSION="\"$(SSH_VERSION)\""' SSH_KEYSIGN='/usr/lib/ssh-keysign'
         # Support building on Debian 3.0 (with GNOME 1.4) and later.
         if [ -f /usr/include/libgnomeui-2.0/gnome.h ]; then \