d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation of ftpcmd.y without -DINET6.

Browse Source 
Respect MK_INET6_SUPPORT in Makefile.

Requested by:	Attila Nagy <bra at fsn dot hu>
MFC after:	1 week
This commit is contained in:
Yaroslav Tykhiy 2006-06-05 15:50:34 +00:00
parent 1df6229aea
commit 31ee80d88a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libexec/ftpd/Makefile
View File

@ -8,7 +8,6 @@ MAN= ftpd.8 ftpchroot.5
SRCS= ftpd.c ftpcmd.y logwtmp.c popen.c SRCS= ftpd.c ftpcmd.y logwtmp.c popen.c
CFLAGS+=-DSETPROCTITLE -DLOGIN_CAP -DVIRTUAL_HOSTING CFLAGS+=-DSETPROCTITLE -DLOGIN_CAP -DVIRTUAL_HOSTING
CFLAGS+=-DINET6
CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}
YFLAGS= YFLAGS=
WARNS?= 2 WARNS?= 2
@ -28,6 +27,10 @@ CFLAGS+=-Dmain=ls_main -I${.CURDIR}/${LSDIR}
DPADD+= ${LIBM} DPADD+= ${LIBM}
LDADD+= -lm LDADD+= -lm
.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+=-DINET6
.endif
.if ${MK_PAM_SUPPORT} != "no" .if ${MK_PAM_SUPPORT} != "no"
CFLAGS+=-DUSE_PAM CFLAGS+=-DUSE_PAM
DPADD+= ${LIBPAM} DPADD+= ${LIBPAM}

4
libexec/ftpd/ftpcmd.y
View File

@ -1145,10 +1145,14 @@ static void help(struct tab *, char *);
static struct tab * static struct tab *
lookup(struct tab *, char *); lookup(struct tab *, char *);
static int port_check(const char *); static int port_check(const char *);
#ifdef INET6
static int port_check_v6(const char *); static int port_check_v6(const char *);
#endif
static void sizecmd(char *); static void sizecmd(char *);
static void toolong(int); static void toolong(int);
#ifdef INET6
static void v4map_data_dest(void); static void v4map_data_dest(void);
#endif
static int yylex(void); static int yylex(void);
static struct tab * static struct tab *