Patchwork [base,02/13] vsftpd: fixup permissions for vsftpd running as ftp user

login
register
mail settings
Submitter Jacob Kjaergaard
Date Sept. 30, 2013, 8:21 a.m.
Message ID <d2a9c905d01c7e2ba2acd5740b15967fc70a8ffd.1380529272.git.jacob.kjaergaard@prevas.dk>
Download mbox | patch
Permalink /patch/278944/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

Jacob Kjaergaard - Sept. 30, 2013, 8:21 a.m.
From: Jacob Kjaergaard <jacob.kjaergaard@prevas.dk>

---
 recipes/vsftpd/files/group  |    1 +
 recipes/vsftpd/files/passwd |    1 +
 recipes/vsftpd/vsftpd.inc   |    4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 recipes/vsftpd/files/group
 create mode 100644 recipes/vsftpd/files/passwd
Esben Haabendal - Oct. 14, 2013, 11:58 a.m.
Merged to master, thanks.

/Esben

Patch

diff --git a/recipes/vsftpd/files/group b/recipes/vsftpd/files/group
new file mode 100644
index 0000000..10c4fcf
--- /dev/null
+++ b/recipes/vsftpd/files/group
@@ -0,0 +1 @@ 
+ftp:*:75:
\ No newline at end of file
diff --git a/recipes/vsftpd/files/passwd b/recipes/vsftpd/files/passwd
new file mode 100644
index 0000000..b120227
--- /dev/null
+++ b/recipes/vsftpd/files/passwd
@@ -0,0 +1 @@ 
+ftp:*:75:75::/home/ftp:/bin/false
diff --git a/recipes/vsftpd/vsftpd.inc b/recipes/vsftpd/vsftpd.inc
index b8df31d..c3d8278 100644
--- a/recipes/vsftpd/vsftpd.inc
+++ b/recipes/vsftpd/vsftpd.inc
@@ -1,10 +1,10 @@ 
 # -*- mode:python; -*-
 DESCRIPTION = "Secure ftp daemon"
 
-inherit c make sysvinit
+inherit c make sysvinit passwd
 
 SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz"
-SRC_URI += "file://init file://vsftpd.conf"
+SRC_URI += "file://init file://vsftpd.conf file://passwd file://group"
 
 DEPENDS_LIBC = "libcrypt libnsl libresolv"
 DEPENDS_LIBC:HOST_LIBC_mingw = ""