Thu Jun 20 15:42:58 2013 UTC ()
Enable wildcard matching in psk files. We are big kids and if we put a *
in the psk file, we mean it.


(christos)
diff -r1.25 -r1.26 src/usr.sbin/racoon/Makefile
cvs diff -r1.25 -r1.26 src/usr.sbin/racoon/Makefile (expand / switch to unified diff)

--- src/usr.sbin/racoon/Makefile 2012/07/14 04:03:44 1.25
+++ src/usr.sbin/racoon/Makefile 2013/06/20 15:42:58 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.25 2012/07/14 04:03:44 christos Exp $ 1# $NetBSD: Makefile,v 1.26 2013/06/20 15:42:58 christos Exp $
2 2
3WARNS?= 0 # XXX third-party program, many issues 3WARNS?= 0 # XXX third-party program, many issues
4NOCLANGERROR= # defined 4NOCLANGERROR= # defined
5 5
6.include <bsd.own.mk> 6.include <bsd.own.mk>
7 7
8USE_FORT?= yes # network client and server 8USE_FORT?= yes # network client and server
9 9
10PROG= racoon 10PROG= racoon
11SRCS= main.c session.c isakmp.c handler.c \ 11SRCS= main.c session.c isakmp.c handler.c \
12 isakmp_ident.c isakmp_agg.c isakmp_base.c \ 12 isakmp_ident.c isakmp_agg.c isakmp_base.c \
13 isakmp_quick.c isakmp_inf.c isakmp_newg.c \ 13 isakmp_quick.c isakmp_inf.c isakmp_newg.c \
14 gssapi.c dnssec.c getcertsbyname.c privsep.c \ 14 gssapi.c dnssec.c getcertsbyname.c privsep.c \
@@ -17,27 +17,27 @@ SRCS= main.c session.c isakmp.c handler. @@ -17,27 +17,27 @@ SRCS= main.c session.c isakmp.c handler.
17 remoteconf.c crypto_openssl.c algorithm.c \ 17 remoteconf.c crypto_openssl.c algorithm.c \
18 proposal.c sainfo.c strnames.c plog.c logger.c \ 18 proposal.c sainfo.c strnames.c plog.c logger.c \
19 schedule.c str2val.c safefile.c backupsa.c \ 19 schedule.c str2val.c safefile.c backupsa.c \
20 genlist.c rsalist.c cftoken.l cfparse.y \ 20 genlist.c rsalist.c cftoken.l cfparse.y \
21 prsa_tok.l prsa_par.y isakmp_xauth.c isakmp_cfg.c \ 21 prsa_tok.l prsa_par.y isakmp_xauth.c isakmp_cfg.c \
22 isakmp_unity.c throttle.c isakmp_frag.c \ 22 isakmp_unity.c throttle.c isakmp_frag.c \
23 nattraversal.c vmbuf.c sockmisc.c misc.c 23 nattraversal.c vmbuf.c sockmisc.c misc.c
24MAN= racoon.8 racoon.conf.5 24MAN= racoon.8 racoon.conf.5
25 25
26DIST= ${NETBSDSRCDIR}/crypto/dist/ipsec-tools 26DIST= ${NETBSDSRCDIR}/crypto/dist/ipsec-tools
27CPPFLAGS+= -I${DIST}/src/racoon -I${DIST}/src/racoon/missing 27CPPFLAGS+= -I${DIST}/src/racoon -I${DIST}/src/racoon/missing
28CPPFLAGS+= -I${DIST}/src/libipsec 28CPPFLAGS+= -I${DIST}/src/libipsec
29CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libipsec -I. 29CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libipsec -I.
30CPPFLAGS+= -DIPSEC_DEBUG -DHAVE_CONFIG_H 30CPPFLAGS+= -DIPSEC_DEBUG -DHAVE_CONFIG_H -DENABLE_WILDCARD_MATCH
31CPPFLAGS+= -DADMINPORTDIR=\"/var/run\" 31CPPFLAGS+= -DADMINPORTDIR=\"/var/run\"
32CPPFLAGS+= -DSYSCONFDIR=\"/etc/racoon\" 32CPPFLAGS+= -DSYSCONFDIR=\"/etc/racoon\"
33 33
34LDADD+= -ll -ly -lipsec -lutil 34LDADD+= -ll -ly -lipsec -lutil
35DPADD+= ${LIBL} ${LIBY} ${LIBCRYPTO} ${LIBUTIL} 35DPADD+= ${LIBL} ${LIBY} ${LIBCRYPTO} ${LIBUTIL}
36 36
37YHEADER=cfparse.h 37YHEADER=cfparse.h
38 38
39CPPFLAGS+=-DHAVE_LIBRADIUS 39CPPFLAGS+=-DHAVE_LIBRADIUS
40LDADD+=-lradius 40LDADD+=-lradius
41DPADD+= ${LIBRADIUS} 41DPADD+= ${LIBRADIUS}
42.if (${USE_PAM} != "no") 42.if (${USE_PAM} != "no")
43CPPFLAGS+=-DHAVE_LIBPAM 43CPPFLAGS+=-DHAVE_LIBPAM