From b75b3e8871ab77a590e59667046fd7bc6757bb05 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 8 Jun 2018 13:42:18 +0200 Subject: [PATCH] add site misc module --- Dockerfile | 1 + rootfs/etc/confd/templates/proftpd.conf.tmpl | 2 ++ rootfs/musl_mempcpy.patch | 13 ------------- 3 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 rootfs/musl_mempcpy.patch diff --git a/Dockerfile b/Dockerfile index ced9d9a..6b64175 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,7 @@ RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/te proftpd-mod_ldap \ proftpd-mod_sftp \ proftpd-mod_auth_file \ + proftpd-mod_site_misc \ proftpd-utils RUN addgroup -g 2222 access diff --git a/rootfs/etc/confd/templates/proftpd.conf.tmpl b/rootfs/etc/confd/templates/proftpd.conf.tmpl index 20dab80..b714f2b 100644 --- a/rootfs/etc/confd/templates/proftpd.conf.tmpl +++ b/rootfs/etc/confd/templates/proftpd.conf.tmpl @@ -13,10 +13,12 @@ AllowOverwrite on RequireValidShell off WtmpLog off + DenyAll +LoadModule mod_site_misc.c LoadModule mod_ldap.c LoadModule mod_sftp.c diff --git a/rootfs/musl_mempcpy.patch b/rootfs/musl_mempcpy.patch deleted file mode 100644 index 9f2978d..0000000 --- a/rootfs/musl_mempcpy.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/pr_fnmatch.c b/lib/pr_fnmatch.c -index 8e46a22..623321f 100644 ---- a/lib/pr_fnmatch.c -+++ b/lib/pr_fnmatch.c -@@ -253,7 +253,7 @@ __wcschrnul (const wchar_t *s, wint_t c) - # ifdef HAVE_MEMPCPY - # define MEMPCPY(D, S, N) mempcpy (D, S, N) - # else --# define MEMPCPY(D, S, N) __mempcpy (D, S, N) -+# define MEMPCPY(D, S, N) mempcpy (D, S, N) - # endif - # define MEMCHR(S, C, N) memchr (S, C, N) - # define STRCOLL(S1, S2) strcoll (S1, S2)