Skip to contentSkip to conversation

vsftpd: install sample config file to /etc

PATCH New Stephan Hoffmann 3 participants 5 messages Jan 16, 2013 – Jan 24, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vsftpd: install sample config file to /etc

vsftpd comes with a sample config file that can serve as a starting point for customization and enables a basic functionality. Since this config refers to a directory "/usr/share/empty" this is also created.

---
 package/vsftpd/vsftpd.mk |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
package/vsftpd/vsftpd.mk +4 -0
index ca711bb..f694b87 100644
@@ -37,6 +37,10 @@ define VSFTPD_INSTALL_TARGET_CMDS
 	test -f $(TARGET_DIR)/etc/init.d/S70vsftpd || \
 		$(INSTALL) -D -m 755 package/vsftpd/vsftpd-init \
 			$(TARGET_DIR)/etc/init.d/S70vsftpd
+	test -f $(TARGET_DIR)/etc/vsftpd.conf || \
+		$(INSTALL) -D -m 644 $(@D)/vsftpd.conf \
+			$(TARGET_DIR)/etc/vsftpd.conf
+	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/empty
 endef
 
 define VSFTPD_UNINSTALL_TARGET_CMDS
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 vsftpd: install sample config file to /etc

Quoted 4 lines · Stephan Hoffmann

vsftpd comes with a sample config file that can serve as a starting point for customization and enables a basic functionality. Since this config refers to a directory "/usr/share/empty" this is also created.

I think the point of /usr/share/empty is that it's a directory that
doesn't exist, so vsftpd will not allow any up/download unless you change the configuration file.

I think it's a bad idea to default giving access to some random
location - even if it is read-only non-anonymous access to an empty directory.

But that's just my opinion.

Regards,
Arnout

Quoted 21 lines
---
  package/vsftpd/vsftpd.mk |    4 ++++
  1 files changed, 4 insertions(+), 0 deletions(-)
package/vsftpd/vsftpd.mk +4 -0
index ca711bb..f694b87 100644
@@ -37,6 +37,10 @@ define VSFTPD_INSTALL_TARGET_CMDS
  	test -f $(TARGET_DIR)/etc/init.d/S70vsftpd || \
  		$(INSTALL) -D -m 755 package/vsftpd/vsftpd-init \
  			$(TARGET_DIR)/etc/init.d/S70vsftpd
+	test -f $(TARGET_DIR)/etc/vsftpd.conf || \
+		$(INSTALL) -D -m 644 $(@D)/vsftpd.conf \
+			$(TARGET_DIR)/etc/vsftpd.conf
+	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/empty
  endef
 
  define VSFTPD_UNINSTALL_TARGET_CMDS
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#2 lore raw

PATCH 1/1 vsftpd: install sample config file to /etc

Am 19.01.2013 11:25, schrieb Arnout Vandecappelle:

Quoted 9 lines · Stephan Hoffmann
Quoted 4 lines

vsftpd comes with a sample config file that can serve as a starting point for customization and enables a basic functionality. Since this config refers to a directory "/usr/share/empty" this is also created.

I think the point of /usr/share/empty is that it's a directory that
doesn't exist, so vsftpd will not allow any up/download unless you change the configuration file.

Arnout, Peter,

I checked this. Obviously, vsftpd uses this directory to chroot there. If it isn't present it refuses to work:

Quoted 2 lines

500 OOPS: vsftpd: not found: directory given in
'secure_chroot_dir':/usr/share/empty

At least I admit that my commit message was misleading. So I'll send a patch to add this;-)

Quoted 3 lines

I think it's a bad idea to default giving access to some random
location - even if it is read-only non-anonymous access to an empty directory.

That is not the case. Default configuration allows anonymous login, but shows empty directory without write access.

Kind regards

Stephan

Quoted 29 lines

But that's just my opinion.

Regards,
Arnout

Quoted 21 lines
---
  package/vsftpd/vsftpd.mk |    4 ++++
  1 files changed, 4 insertions(+), 0 deletions(-)
package/vsftpd/vsftpd.mk +4 -0
index ca711bb..f694b87 100644
@@ -37,6 +37,10 @@ define VSFTPD_INSTALL_TARGET_CMDS
      test -f $(TARGET_DIR)/etc/init.d/S70vsftpd || \
          $(INSTALL) -D -m 755 package/vsftpd/vsftpd-init \
              $(TARGET_DIR)/etc/init.d/S70vsftpd
+    test -f $(TARGET_DIR)/etc/vsftpd.conf || \
+        $(INSTALL) -D -m 644 $(@D)/vsftpd.conf \
+            $(TARGET_DIR)/etc/vsftpd.conf
+    $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/empty
  endef
 
  define VSFTPD_UNINSTALL_TARGET_CMDS
Signature · 4 lines
reLinux     -    Stephan Hoffmann
Am Schmidtgrund 124    50765 K?ln
Tel. +49.221.95595-19    Fax: -64
www.reLinux.de     sho at reLinux.de
#3 lore raw

PATCH 1/1 vsftpd: install sample config file to /etc

Quoted 21 lines · Stephan Hoffmann

Am 19.01.2013 11:25, schrieb Arnout Vandecappelle:

Quoted 9 lines · Stephan Hoffmann
Quoted 4 lines

vsftpd comes with a sample config file that can serve as a starting point for customization and enables a basic functionality. Since this config refers to a directory "/usr/share/empty" this is also created.

I think the point of /usr/share/empty is that it's a directory that
doesn't exist, so vsftpd will not allow any up/download unless you change the configuration file.

Arnout, Peter,

I checked this. Obviously, vsftpd uses this directory to chroot there. If it isn't present it refuses to work:

Quoted 2 lines

500 OOPS: vsftpd: not found: directory given in
'secure_chroot_dir':/usr/share/empty

At least I admit that my commit message was misleading. So I'll send a patch to add this;-)

Quoted 6 lines
Quoted 3 lines

I think it's a bad idea to default giving access to some random
location - even if it is read-only non-anonymous access to an empty directory.

That is not the case. Default configuration allows anonymous login, but shows empty directory without write access.

I still think it's better to make vsftpd fail to start than to give
anonymous read-only access to some random empty directory. That way you at least notice that something is wrong.

That said, it's no big deal. It's just a pity that if you provide a
real vsftpd.conf in the post-build script, you'll still get this useless /usr/share/empty.

Regards,
Arnout

[snip]

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#4 lore raw

PATCH 1/1 vsftpd: install sample config file to /etc

In reply to Stephan Hoffmann
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Stephan" == Stephan Hoffmann <[email protected]> writes:

Stephan> vsftpd comes with a sample config file that can serve as a starting Stephan> point for customization and enables a basic functionality. Since Stephan> this config refers to a directory "/usr/share/empty" this is also Stephan> created.

Stephan> Signed-off-by: Stephan Hoffmann <[email protected]> Stephan> ---

 Stephan>  package/vsftpd/vsftpd.mk |    4 ++++

Stephan> 1 files changed, 4 insertions(+), 0 deletions(-)

Stephan> diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk Stephan> index ca711bb..f694b87 100644
Stephan> --- a/package/vsftpd/vsftpd.mk
Stephan> +++ b/package/vsftpd/vsftpd.mk
Stephan> @@ -37,6 +37,10 @@ define VSFTPD_INSTALL_TARGET_CMDS

 Stephan>  	test -f $(TARGET_DIR)/etc/init.d/S70vsftpd || \
 Stephan>  		$(INSTALL) -D -m 755 package/vsftpd/vsftpd-init \
 Stephan>  			$(TARGET_DIR)/etc/init.d/S70vsftpd

Stephan> + test -f $(TARGET_DIR)/etc/vsftpd.conf || \
Stephan> + $(INSTALL) -D -m 644 $(@D)/vsftpd.conf \
Stephan> + $(TARGET_DIR)/etc/vsftpd.conf
Stephan> + $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/empty

Committed minus the /usr/share/empty creation, thanks.

Signature · 1 line
Bye, Peter Korsgaard