Attachment #2926 for bug #2660

Lines 457-462 regress/check-perm$(EXEEXT): $(srcdir)/regress/check-perm.c $(REGRESSLIBS) Link Here

(-)a/Makefile.in (+5 lines)
457	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/check-perm.c \	457	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/check-perm.c \
458	$(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)	458	$(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
459		459
		460	regress/mkdtemp$(EXEEXT): $(srcdir)/regress/mkdtemp.c $(REGRESSLIBS)
		461	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/mkdtemp.c \
		462	$(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
		463
460	UNITTESTS_TEST_HELPER_OBJS=\	464	UNITTESTS_TEST_HELPER_OBJS=\
461	regress/unittests/test_helper/test_helper.o \	465	regress/unittests/test_helper/test_helper.o \
462	regress/unittests/test_helper/fuzz.o	466	regress/unittests/test_helper/fuzz.o
Lines 555-560 regress-binaries: regress/modpipe$(EXEEXT) \ Link Here
555	regress/setuid-allowed$(EXEEXT) \	559	regress/setuid-allowed$(EXEEXT) \
556	regress/netcat$(EXEEXT) \	560	regress/netcat$(EXEEXT) \
557	regress/check-perm$(EXEEXT) \	561	regress/check-perm$(EXEEXT) \
		562	regress/mkdtemp$(EXEEXT) \
558	regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \	563	regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
559	regress/unittests/sshkey/test_sshkey$(EXEEXT) \	564	regress/unittests/sshkey/test_sshkey$(EXEEXT) \
560	regress/unittests/bitmap/test_bitmap$(EXEEXT) \	565	regress/unittests/bitmap/test_bitmap$(EXEEXT) \

Lines 10-17 start_sshd Link Here

(-)a/regress/forwarding.sh (-2 / +2 lines)
10	base=33	10	base=33
11	last=$PORT	11	last=$PORT
12	fwd=""	12	fwd=""
13	CTL=$OBJ/ctl-sock	13	make_tmpdir
14	rm -f $CTL	14	CTL=$TMP/ctl-sock
15		15
16	for j in 0 1 2; do	16	for j in 0 1 2; do
17	for i in 0 1 2; do	17	for i in 0 1 2; do




/*
 * Copyright (c) 2017 Colin Watson <cjwatson@debian.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.
 */

/* Roughly equivalent to "mktemp -d -t TEMPLATE", but portable. */

#include "includes.h"

#include <limits.h>
#include <stdio.h>
#include <stdlib.h>

#include "log.h"

static void
usage(void)
{
	fprintf(stderr, "mkdtemp template\n");
	exit(1);
}

int
main(int argc, char **argv)
{
	const char *base;
	const char *tmpdir;
	char template[PATH_MAX];
	int r;
	char *dir;

	if (argc != 2)
		usage();
	base = argv[1];

	if ((tmpdir = getenv("TMPDIR")) == NULL)
		tmpdir = "/tmp";
	r = snprintf(template, sizeof(template), "%s/%s", tmpdir, base);
	if (r < 0 || (size_t)r >= sizeof(template))
		fatal("template string too long");
	dir = mkdtemp(template);
	if (dir == NULL) {
		perror("mkdtemp");
		exit(1);
	}
	puts(dir);
	return 0;
}

Lines 1-7 Link Here

(-)a/regress/multiplex.sh (-1 / +2 lines)
1	# $OpenBSD: multiplex.sh,v 1.27 2014/12/22 06:14:29 djm Exp $	1	# $OpenBSD: multiplex.sh,v 1.27 2014/12/22 06:14:29 djm Exp $
2	# Placed in the Public Domain.	2	# Placed in the Public Domain.
3		3
4	CTL=/tmp/openssh.regress.ctl-sock.$$	4	make_tmpdir
		5	CTL=$TMP/ctl-sock
5		6
6	tid="connection multiplexing"	7	tid="connection multiplexing"
7		8

Lines 317-322 stop_sshd () Link Here

(-)a/regress/test-exec.sh (-1 / +11 lines)
317	fi	317	fi
318	}	318	}
319		319
		320	TMP=
		321
		322	make_tmpdir ()
		323	{
		324	TMP="$($OBJ/mkdtemp openssh-regress-XXXXXXXXXXXX)" \|\| \
		325	fatal "failed to create temporary directory"
		326	}
		327
320	# helper	328	# helper
321	cleanup ()	329	cleanup ()
322	{	330	{
Lines 327-332 cleanup () Link Here
327	kill $SSH_PID	335	kill $SSH_PID
328	fi	336	fi
329	fi	337	fi
		338	if [ "x$TMP" != "x" ]; then
		339	rm -rf "$TMP"
		340	fi
330	stop_sshd	341	stop_sshd
331	}	342	}
332		343
333	-

Return to bug 2660

Line 0 Link Here

(-)a/regress/mkdtemp.c (+59 lines)
	1	/*
	2	* Copyright (c) 2017 Colin Watson <cjwatson@debian.org>
	3	*
	4	* Permission to use, copy, modify, and distribute this software for any
	5	* purpose with or without fee is hereby granted, provided that the above
	6	* copyright notice and this permission notice appear in all copies.
	7	*
	8	* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
	9	* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
	10	* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
	11	* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
	12	* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
	13	* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
	14	* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
	15	*/
	16
	17	/* Roughly equivalent to "mktemp -d -t TEMPLATE", but portable. */
	18
	19	#include "includes.h"
	20
	21	#include <limits.h>
	22	#include <stdio.h>
	23	#include <stdlib.h>
	24
	25	#include "log.h"
	26
	27	static void
	28	usage(void)
	29	{
	30	fprintf(stderr, "mkdtemp template\n");
	31	exit(1);
	32	}
	33
	34	int
	35	main(int argc, char **argv)
	36	{
	37	const char *base;
	38	const char *tmpdir;
	39	char template[PATH_MAX];
	40	int r;
	41	char *dir;
	42
	43	if (argc != 2)
	44	usage();
	45	base = argv[1];
	46
	47	if ((tmpdir = getenv("TMPDIR")) == NULL)
	48	tmpdir = "/tmp";
	49	r = snprintf(template, sizeof(template), "%s/%s", tmpdir, base);
	50	if (r < 0 \|\| (size_t)r >= sizeof(template))
	51	fatal("template string too long");
	52	dir = mkdtemp(template);
	53	if (dir == NULL) {
	54	perror("mkdtemp");
	55	exit(1);
	56	}
	57	puts(dir);
	58	return 0;
	59	}