5 files changed, 75 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3434d6d27..c56f59785 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 20131208
  - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna
    Vinschen
+ - (djm) [Makefile.in regress/Makefile regress/agent-ptrace.sh]
+   [regress/setuid-allowed.c] Check that ssh-agent is not on a no-setuid
+   filesystem before running agent-ptrace.sh; ok dtucker
 
 20131207
  - (djm) OpenBSD CVS Sync
diff --git a/Makefile.in b/Makefile.in
index f45c88098..e789b476a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.347 2013/12/07 10:43:47 djm Exp $
+# $Id: Makefile.in,v 1.348 2013/12/08 04:53:28 djm Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -401,6 +401,13 @@ regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
         $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
         $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
+regress/setuid-allowed$(EXEEXT): $(srcdir)/regress/setuid-allowed.c
+        [ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress
+        [ -f `pwd`/regress/Makefile ]  || \
+            ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
+        $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
+        $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+
 tests interop-tests:    $(TARGETS) regress/modpipe$(EXEEXT)
         BUILDDIR=`pwd`; \
         TEST_SHELL="@TEST_SHELL@"; \
diff --git a/regress/Makefile b/regress/Makefile
index 098f2014b..ba8504837 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -88,7 +88,7 @@ CLEANFILES=	t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
                 sshd_proxy.* authorized_keys_${USER}.* modpipe revoked-* krl-* \
                 ssh.log failed-ssh.log sshd.log failed-sshd.log \
                 regress.log failed-regress.log ssh-log-wrapper.sh \
-                sftp-server.sh sftp-server.log sftp.log
+                sftp-server.sh sftp-server.log sftp.log setuid-allowed
 
 SUDO_CLEAN+=    /var/run/testdata_${USER} /var/run/keycommand_${USER}
 
diff --git a/regress/agent-ptrace.sh b/regress/agent-ptrace.sh
index 9f29464c5..6824b8141 100644
--- a/regress/agent-ptrace.sh
+++ b/regress/agent-ptrace.sh
@@ -19,6 +19,13 @@ else
         exit 0
 fi
 
+if $OBJ/setuid-allowed ${SSHAGENT} ; then
+        : ok
+else
+        echo "skipped (${SSHAGENT} is mounted on a no-setuid filesystem)"
+        exit 0
+fi
+
 if test -z "$SUDO" ; then
         echo "skipped (SUDO not set)"
         exit 0
diff --git a/regress/setuid-allowed.c b/regress/setuid-allowed.c
new file mode 100644
index 000000000..37b7dc8ad
--- /dev/null
+++ b/regress/setuid-allowed.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2013 Damien Miller <djm@mindrot.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* $OpenBSD$ */
+
+#include "includes.h"
+
+#include <sys/types.h>
+#ifdef HAVE_SYS_STATVFS_H
+# include <sys/statvfs.h>
+#endif
+#include <stdio.h>
+#include <errno.h>
+
+void
+usage(void)
+{
+        fprintf(stderr, "check-setuid [path]\n");
+        exit(1);
+}
+
+int
+main(int argc, char **argv)
+{
+        const char *path = ".";
+        struct statvfs sb;
+
+        if (argc > 2)
+                usage();
+        else if (argc == 2)
+                path = argv[1];
+
+        if (statvfs(path, &sb) != 0) {
+                /* Don't return an error if the host doesn't support statvfs */
+                if (errno == ENOSYS)
+                        return 0;
+                fprintf(stderr, "statvfs for \"%s\" failed: %s\n",
+                     path, strerror(errno));
+        }
+        return (sb.f_flag & ST_NOSUID) ? 1 : 0;
+}
+
+