[BUGFIX][T108][bug-view-1766] Fix the bug that ftp cannot log in
Only Configure: No
Affected branch: GSW_V1453
Affected module: ftp
Is it affected on IC: only ASR
Self-test: yes
Doc Update: no
Change-Id: I8d5c487093f0e07654e21bc6107ae5d7aeddbd9e
diff --git a/external/subpack/net/vsftpd/Makefile b/external/subpack/net/vsftpd/Makefile
old mode 100644
new mode 100755
index 4e75f75..571fb7a
--- a/external/subpack/net/vsftpd/Makefile
+++ b/external/subpack/net/vsftpd/Makefile
@@ -34,6 +34,7 @@
$(call Package/vsftpd/Default)
VARIANT:=notls
TITLE+= (no TLS)
+ DEPENDS+=+libwrap
endef
define Package/vsftpd-tls
@@ -59,10 +60,12 @@
endif
TARGET_CFLAGS += -D_GNU_SOURCE -include fcntl.h
+TARGET_LDFLAGS += -lwrap
ifeq ($(BUILD_VARIANT),notls)
define Build/Compile
$(SED) 's/-lcrypt -lnsl/$(NLSSTRING)/' $(PKG_BUILD_DIR)/Makefile
+ $(SED) 's/#undef VSF_BUILD_TCPWRAPPERS/#define VSF_BUILD_TCPWRAPPERS/' $(PKG_BUILD_DIR)/builddefs.h
$(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
diff --git a/external/subpack/net/vsftpd/files/vsftpd.init b/external/subpack/net/vsftpd/files/vsftpd.init
index 0f37da4..b3dee9e 100644
--- a/external/subpack/net/vsftpd/files/vsftpd.init
+++ b/external/subpack/net/vsftpd/files/vsftpd.init
@@ -8,6 +8,8 @@
start_service() {
mkdir -m 0755 -p /var/run/vsftpd
+ mkdir -m 0755 -p /media/ftp
+
procd_open_instance
procd_set_param command "$PROG"
procd_set_param respawn