]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: few more things needs match.c and addrmatch.c now that
authordjm@openbsd.org <djm@openbsd.org>
Fri, 16 Oct 2020 14:02:24 +0000 (14:02 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Mon, 21 Dec 2020 03:04:08 +0000 (14:04 +1100)
log.c calls match_pattern_list()

OpenBSD-Regress-ID: f7c95c76b150d0aeb00a67858b9579b7d1b2db74

regress/unittests/conversion/Makefile
regress/unittests/misc/Makefile
regress/unittests/sshbuf/Makefile

index 8b2a09cc39fe34f83f2e883267d2bd1296dc5923..5ec667bf8c0565b578eaf07d161cc18676613353 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.2 2017/12/21 00:41:22 djm Exp $
+#      $OpenBSD: Makefile,v 1.3 2020/10/16 14:02:24 djm Exp $
 
 PROG=test_conversion
 SRCS=tests.c
@@ -6,6 +6,7 @@ SRCS=tests.c
 # From usr.bin/ssh
 SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c
 SRCS+=atomicio.c misc.c xmalloc.c log.c uidswap.c cleanup.c fatal.c ssherr.c
+SRCS+=match.c addrmatch.c
 
 REGRESS_TARGETS=run-regress-${PROG}
 
index 0c8ebc7d4265d1bae230d755503b34bc264c3988..6f0df8ec949c0f2e9746567c2b2df12ab9c27466 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.2 2019/08/22 21:47:27 bluhm Exp $
+#      $OpenBSD: Makefile,v 1.3 2020/10/16 14:02:24 djm Exp $
 
 PROG=test_misc
 SRCS=tests.c
@@ -11,6 +11,8 @@ SRCS+=        ssherr.c
 SRCS+= log.c
 SRCS+= xmalloc.c
 SRCS+= misc.c
+SRCS+= match.c
+SRCS+= addrmatch.c
 
 # From usr.bin/ssh/sshd/Makefile
 SRCS+= atomicio.c cleanup.c fatal.c
index 5f6c4426a7b0eb4f317cb5b10ec1281e0399711b..56d91cc2619294a1dc78e2a1efcde95f0ff3b32c 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.8 2020/01/26 00:09:50 djm Exp $
+#      $OpenBSD: Makefile,v 1.9 2020/10/16 14:02:24 djm Exp $
 
 #      $OpenBSD: Makefile,v 1.8 2020/01/26 00:09:50 djm Exp $
 
@@ -15,6 +15,7 @@ SRCS+=test_sshbuf_fixed.c
 # From usr.bin/ssh
 SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c
 SRCS+=sshbuf-io.c atomicio.c misc.c xmalloc.c log.c fatal.c ssherr.c cleanup.c
+SRCS+=match.c addrmatch.c
 
 run-regress-${PROG}: ${PROG}
        env ${TEST_ENV} ./${PROG} ${UNITTEST_ARGS}