diff options
| author | yar <yar@FreeBSD.org> | 2006-06-05 15:50:34 +0000 |
|---|---|---|
| committer | yar <yar@FreeBSD.org> | 2006-06-05 15:50:34 +0000 |
| commit | 5f5215a6775a835ec48e3878bf37780898e9b893 (patch) | |
| tree | 9a9654cb0c618cddc6b1cfd352c897baeb773b1a /libexec/ftpd | |
| parent | 97c0c78df70e64fd7f0d13f3b2cf1a39485d6f42 (diff) | |
| download | FreeBSD-src-5f5215a6775a835ec48e3878bf37780898e9b893.zip FreeBSD-src-5f5215a6775a835ec48e3878bf37780898e9b893.tar.gz | |
Fix compilation of ftpcmd.y without -DINET6.
Respect MK_INET6_SUPPORT in Makefile.
Requested by: Attila Nagy <bra at fsn dot hu>
MFC after: 1 week
Diffstat (limited to 'libexec/ftpd')
| -rw-r--r-- | libexec/ftpd/Makefile | 5 | ||||
| -rw-r--r-- | libexec/ftpd/ftpcmd.y | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index ceb46e2..e415407f 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -8,7 +8,6 @@ MAN= ftpd.8 ftpchroot.5 SRCS= ftpd.c ftpcmd.y logwtmp.c popen.c CFLAGS+=-DSETPROCTITLE -DLOGIN_CAP -DVIRTUAL_HOSTING -CFLAGS+=-DINET6 CFLAGS+=-I${.CURDIR} YFLAGS= WARNS?= 2 @@ -28,6 +27,10 @@ CFLAGS+=-Dmain=ls_main -I${.CURDIR}/${LSDIR} DPADD+= ${LIBM} LDADD+= -lm +.if ${MK_INET6_SUPPORT} != "no" +CFLAGS+=-DINET6 +.endif + .if ${MK_PAM_SUPPORT} != "no" CFLAGS+=-DUSE_PAM DPADD+= ${LIBPAM} diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index d40e354..5235a40 100644 --- a/libexec/ftpd/ftpcmd.y +++ b/libexec/ftpd/ftpcmd.y @@ -1145,10 +1145,14 @@ static void help(struct tab *, char *); static struct tab * lookup(struct tab *, char *); static int port_check(const char *); +#ifdef INET6 static int port_check_v6(const char *); +#endif static void sizecmd(char *); static void toolong(int); +#ifdef INET6 static void v4map_data_dest(void); +#endif static int yylex(void); static struct tab * |
