Fixed a security problem where the custom snprintf() would always be used. Thanks...

[betaftpd] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 95404008acc8c9fe7e73c4ceba87f15dda663aae..cdc7f5db34faad5cbf1d1630ef256a52ac7d5c77 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@ VPATH = @srcdir@
 prefix = @prefix@
 
 CFLAGS      = @CFLAGS@
-REAL_CFLAGS = $(CFLAGS) @DEFS@ -I@srcdir@ -I. -DVERSION=\"$(VERSION)\"
+CPPFLAGS    = @DEFS@ -I@srcdir@ -I. -DVERSION=\"$(VERSION)\"
 LIBS        = @LIBS@
 OBJS        = disp.o ftpd.o cmds.o nonroot.o ascii.o dcache.o
 ASSMS       = ${OBJS:.o=.s}
@@ -17,9 +17,9 @@ CPPS        = ${OBJS:.o=.i}
 
 # Since we use VPATH, override .c.o rule
 .c.o:  $*.c config.h
-       $(CC) $(REAL_CFLAGS) -c @srcdir@/$*.c
+       $(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/$*.c
 .c.s:  $*.c config.h
-       $(CC) $(REAL_CFLAGS) -S @srcdir@/$*.c
+       $(CC) $(CFLAGS) $(CPPFLAGS) -S @srcdir@/$*.c
 
 # deps
 cmds.o:                @srcdir@/cmds.c @srcdir@/ftpd.h @srcdir@/cmds.h @srcdir@/nonroot.h @srcdir@/dcache.h config.h
@@ -30,7 +30,7 @@ ascii.o:      @srcdir@/ascii.c @srcdir@/ascii.h config.h
 dcache.o:      @srcdir@/dcache.c @srcdir@/dcache.h config.h
 
 betaftpd: $(OBJS)
-       $(CC) $(REAL_CFLAGS) -o betaftpd $(OBJS) $(LIBS)
+       $(CC) $(CFLAGS) -o betaftpd $(OBJS) $(LIBS)
 assembly-files: $(ASSMS)
 betaftpd-from-assembly-files: $(ASSMS)
        $(CC) $(LIBS) -o betaftpd -Wl,--sort-common $(ASSMS)
@@ -74,4 +74,4 @@ package:
        cp debian/control debian/copyright debian/dirs betaftpd-$(VERSION)/debian
        cp debian/init.d debian/rules debian/watch.ex betaftpd-$(VERSION)/debian
        tar cf - betaftpd-$(VERSION)/ | gzip -9vv > betaftpd-$(VERSION).tar.gz
-       tar cf - betaftpd-$(VERSION)/ | bzip2 -3vv > betaftpd-$(VERSION).tar.bz2
+       tar cf - betaftpd-$(VERSION)/ | bzip2 -4vv > betaftpd-$(VERSION).tar.bz2