summaryrefslogtreecommitdiff
path: root/libexec/ftpd
diff options
context:
space:
mode:
authorYaroslav Tykhiy <ytykhiy@gmail.com>2006-06-05 15:50:34 +0000
committerYaroslav Tykhiy <ytykhiy@gmail.com>2006-06-05 15:50:34 +0000
commit31ee80d88ae1bfe8d074741f9324ae015e6f286a (patch)
tree9a9654cb0c618cddc6b1cfd352c897baeb773b1a /libexec/ftpd
parent1df6229aeab3e46661111b77846b8aa1e929c1ec (diff)
Notes
Diffstat (limited to 'libexec/ftpd')
-rw-r--r--libexec/ftpd/Makefile5
-rw-r--r--libexec/ftpd/ftpcmd.y4
2 files changed, 8 insertions, 1 deletions
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index ceb46e2d4e33..e415407fb9e6 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 d40e354aa33d..5235a4079a1c 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 *