Commit 98402610 authored by Maarten ter Huurne's avatar Maarten ter Huurne Committed by Peter Korsgaard
Browse files

vsftpd: Add build option to disable utmpx update code 



This was modeled after a similar option for Dropbear.

The utmpx code is automatically disabled when compiling with musl,
to avoid a build error due to WTMPX_FILE being undefined. Note that
musl has an empty utmpx implementation, so no functionality is lost
by not calling it.

[Peter: use positive logic]
Signed-off-by: default avatarMaarten ter Huurne <maarten@treewalker.org>
Tested-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent df8ae412

package/vsftpd/Config.in

+12 −0
Original line number Diff line number Diff line
@@ -4,3 +4,15 @@ config BR2_PACKAGE_VSFTPD 
	help

	  vsftpd is an ftp daemon written with security in mind.

	  http://vsftpd.beasts.org/



if BR2_PACKAGE_VSFTPD



config BR2_PACKAGE_VSFTPD_UTMPX

	bool "log vsftpd access to utmpx"

	# musl 1.1.4 has an empty utmpx implementation and no WTMPX_FILE

	depends on !BR2_TOOLCHAIN_USES_MUSL

	help

	  Enable logging of vsftpd access to utmpx.

	  Note that Buildroot does not generate utmpx by default.



endif

package/vsftpd/vsftpd-0001-utmpx-builddef.patch

0 → 100644
+49 −0
Original line number Diff line number Diff line 
Add build option to disable utmpx update code



On some embedded systems the libc may have utmpx support, but the

feature would be redundant. So add a build switch to disable utmpx

updating, similar to compiling on systems without utmpx support.



Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>



diff -ru vsftpd-3.0.2.orig/builddefs.h vsftpd-3.0.2/builddefs.h

--- vsftpd-3.0.2.orig/builddefs.h	2012-04-05 05:24:56.000000000 +0200

+++ vsftpd-3.0.2/builddefs.h	2014-09-16 14:23:36.128003245 +0200

@@ -4,6 +4,7 @@

 #undef VSF_BUILD_TCPWRAPPERS

 #define VSF_BUILD_PAM

 #undef VSF_BUILD_SSL

+#define VSF_BUILD_UTMPX

 

 #endif /* VSF_BUILDDEFS_H */

 

diff -ru vsftpd-3.0.2.orig/sysdeputil.c vsftpd-3.0.2/sysdeputil.c

--- vsftpd-3.0.2.orig/sysdeputil.c	2012-09-16 06:18:04.000000000 +0200

+++ vsftpd-3.0.2/sysdeputil.c	2014-09-16 14:26:42.686887724 +0200

@@ -1158,7 +1158,7 @@

 

 #endif /* !VSF_SYSDEP_NEED_OLD_FD_PASSING */

 

-#ifndef VSF_SYSDEP_HAVE_UTMPX

+#if !defined(VSF_BUILD_UTMPX) || !defined(VSF_SYSDEP_HAVE_UTMPX)

 

 void

 vsf_insert_uwtmp(const struct mystr* p_user_str,

@@ -1173,7 +1173,7 @@

 {

 }

 

-#else /* !VSF_SYSDEP_HAVE_UTMPX */

+#else /* !VSF_BUILD_UTMPX || !VSF_SYSDEP_HAVE_UTMPX */

 

 /* IMHO, the pam_unix module REALLY should be doing this in its SM component */

 /* Statics */

@@ -1238,7 +1238,7 @@

   updwtmpx(WTMPX_FILE, &s_utent);

 }

 

-#endif /* !VSF_SYSDEP_HAVE_UTMPX */

+#endif /* !VSF_BUILD_UTMPX || !VSF_SYSDEP_HAVE_UTMPX */

 

 void

 vsf_set_die_if_parent_dies()

package/vsftpd/vsftpd.mk

+8 −0
Original line number Diff line number Diff line
@@ -10,10 +10,18 @@ VSFTPD_LIBS = -lcrypt 
VSFTPD_LICENSE = GPLv2

VSFTPD_LICENSE_FILES = COPYING



define VSFTPD_DISABLE_UTMPX

	$(SED) 's/.*VSF_BUILD_UTMPX/#undef VSF_BUILD_UTMPX/' $(@D)/builddefs.h

endef



define VSFTPD_ENABLE_SSL

	$(SED) 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' $(@D)/builddefs.h

endef



ifeq ($(BR2_PACKAGE_VSFTPD_UTMPX),)

VSFTPD_POST_CONFIGURE_HOOKS += VSFTPD_DISABLE_UTMPX

endif



ifeq ($(BR2_PACKAGE_OPENSSL),y)

VSFTPD_DEPENDENCIES += openssl

VSFTPD_LIBS += -lssl -lcrypto