diff options
author | Tim Rice <tim@multitalents.net> | 2013-02-19 19:01:51 -0800 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2013-02-19 19:01:51 -0800 |
commit | c31db8cd6e301c8d4024cb9250e3178d13d1be44 (patch) | |
tree | 2199bc2ede9202280b28363168e6cb016fbdaa59 | |
parent | c08b3ef6f435b64c3b7125f93e5b3e661e019f3e (diff) |
- (tim) [krl.c Makefile.in regress/Makefile regress/modpipe.c] remove unneeded
err.h include from krl.c. Additional portability fixes for modpipe. OK djm
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile.in | 12 | ||||
-rw-r--r-- | krl.c | 1 | ||||
-rw-r--r-- | regress/Makefile | 6 | ||||
-rwxr-xr-x | regress/modpipe.c | 3 |
5 files changed, 14 insertions, 12 deletions
@@ -1,5 +1,7 @@ | |||
1 | 20130220 | 1 | 20130220 |
2 | - (tim) [regress/cipher-speed.sh regress/try-ciphers.sh] shell portability fix. | 2 | - (tim) [regress/cipher-speed.sh regress/try-ciphers.sh] shell portability fix. |
3 | - (tim) [krl.c Makefile.in regress/Makefile regress/modpipe.c] remove unneeded | ||
4 | err.h include from krl.c. Additional portability fixes for modpipe. OK djm | ||
3 | 5 | ||
4 | 20130219 | 6 | 20130219 |
5 | - OpenBSD CVS Sync | 7 | - OpenBSD CVS Sync |
@@ -13,6 +15,8 @@ | |||
13 | we actually reach $offset | 15 | we actually reach $offset |
14 | - (djm) [regress/integrity.sh] Skip SHA2-based MACs on configurations that | 16 | - (djm) [regress/integrity.sh] Skip SHA2-based MACs on configurations that |
15 | lack support for SHA2. | 17 | lack support for SHA2. |
18 | - (djm) [regress/modpipe.c] Add local err, and errx functions for platforms | ||
19 | that do not have them. | ||
16 | 20 | ||
17 | 20130217 | 21 | 20130217 |
18 | - OpenBSD CVS Sync | 22 | - OpenBSD CVS Sync |
diff --git a/Makefile.in b/Makefile.in index ec3e1f417..44d594441 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.331 2013/02/12 00:00:34 djm Exp $ | 1 | # $Id: Makefile.in,v 1.332 2013/02/20 03:01:51 tim Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -379,14 +379,16 @@ uninstall: | |||
379 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | 379 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 |
380 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 380 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
381 | 381 | ||
382 | tests interop-tests: $(TARGETS) | 382 | regress/modpipe: $(srcdir)/regress/modpipe.c |
383 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | ||
384 | $(CC) $(CPPFLAGS) -o $@ $? \ | ||
385 | $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | ||
386 | |||
387 | tests interop-tests: $(TARGETS) regress/modpipe | ||
383 | BUILDDIR=`pwd`; \ | 388 | BUILDDIR=`pwd`; \ |
384 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | 389 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ |
385 | [ -f `pwd`/regress/Makefile ] || \ | 390 | [ -f `pwd`/regress/Makefile ] || \ |
386 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \ | 391 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \ |
387 | [ -f `pwd`/regress/modpipe.c ] || \ | ||
388 | ln -s `cd $(srcdir) && pwd`/regress/modpipe.c `pwd`/regress/modpipe.c; \ | ||
389 | (cd regress && make prereq); \ | ||
390 | TEST_SHELL="@TEST_SHELL@"; \ | 392 | TEST_SHELL="@TEST_SHELL@"; \ |
391 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ | 393 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ |
392 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ | 394 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ |
@@ -33,7 +33,6 @@ | |||
33 | #include "buffer.h" | 33 | #include "buffer.h" |
34 | #include "key.h" | 34 | #include "key.h" |
35 | #include "authfile.h" | 35 | #include "authfile.h" |
36 | #include "err.h" | ||
37 | #include "misc.h" | 36 | #include "misc.h" |
38 | #include "log.h" | 37 | #include "log.h" |
39 | #include "xmalloc.h" | 38 | #include "xmalloc.h" |
diff --git a/regress/Makefile b/regress/Makefile index c3aec43fc..779abf4fb 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,7 +1,7 @@ | |||
1 | # $OpenBSD: Makefile,v 1.62 2013/01/18 00:45:29 djm Exp $ | 1 | # $OpenBSD: Makefile,v 1.62 2013/01/18 00:45:29 djm Exp $ |
2 | 2 | ||
3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec | 3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec |
4 | tests: prereq $(REGRESS_TARGETS) | 4 | tests: $(REGRESS_TARGETS) |
5 | 5 | ||
6 | # Interop tests are not run by default | 6 | # Interop tests are not run by default |
7 | interop interop-tests: t-exec-interop | 7 | interop interop-tests: t-exec-interop |
@@ -146,10 +146,6 @@ t9: $(OBJ)/t9.out | |||
146 | test "${TEST_SSH_ECC}" != yes || \ | 146 | test "${TEST_SSH_ECC}" != yes || \ |
147 | ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null | 147 | ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null |
148 | 148 | ||
149 | prereq: modpipe | ||
150 | |||
151 | modpipe: modpipe.c | ||
152 | |||
153 | t-exec: ${LTESTS:=.sh} | 149 | t-exec: ${LTESTS:=.sh} |
154 | @if [ "x$?" = "x" ]; then exit 0; fi; \ | 150 | @if [ "x$?" = "x" ]; then exit 0; fi; \ |
155 | for TEST in ""$?; do \ | 151 | for TEST in ""$?; do \ |
diff --git a/regress/modpipe.c b/regress/modpipe.c index b05915b63..1d4229885 100755 --- a/regress/modpipe.c +++ b/regress/modpipe.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | /* $Id: modpipe.c,v 1.2 2013/02/19 02:15:08 djm Exp $ */ | 17 | /* $Id: modpipe.c,v 1.3 2013/02/20 03:01:52 tim Exp $ */ |
18 | 18 | ||
19 | #include <sys/types.h> | 19 | #include <sys/types.h> |
20 | #include <unistd.h> | 20 | #include <unistd.h> |
@@ -23,6 +23,7 @@ | |||
23 | #include <stdarg.h> | 23 | #include <stdarg.h> |
24 | #include <stdlib.h> | 24 | #include <stdlib.h> |
25 | #include <errno.h> | 25 | #include <errno.h> |
26 | #include "openbsd-compat/getopt.c" | ||
26 | 27 | ||
27 | static void err(int, const char *, ...) __attribute__((format(printf, 2, 3))); | 28 | static void err(int, const char *, ...) __attribute__((format(printf, 2, 3))); |
28 | static void errx(int, const char *, ...) __attribute__((format(printf, 2, 3))); | 29 | static void errx(int, const char *, ...) __attribute__((format(printf, 2, 3))); |