1*4882a593SmuzhiyunAdd build option to disable utmpx update code 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunOn some embedded systems the libc may have utmpx support, but the 4*4882a593Smuzhiyunfeature would be redundant. So add a build switch to disable utmpx 5*4882a593Smuzhiyunupdating, similar to compiling on systems without utmpx support. 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunSigned-off-by: Maarten ter Huurne <maarten@treewalker.org> 8*4882a593Smuzhiyun 9*4882a593Smuzhiyundiff -ru vsftpd-3.0.2.orig/builddefs.h vsftpd-3.0.2/builddefs.h 10*4882a593Smuzhiyun--- vsftpd-3.0.2.orig/builddefs.h 2012-04-05 05:24:56.000000000 +0200 11*4882a593Smuzhiyun+++ vsftpd-3.0.2/builddefs.h 2014-09-16 14:23:36.128003245 +0200 12*4882a593Smuzhiyun@@ -4,6 +4,7 @@ 13*4882a593Smuzhiyun #undef VSF_BUILD_TCPWRAPPERS 14*4882a593Smuzhiyun #define VSF_BUILD_PAM 15*4882a593Smuzhiyun #undef VSF_BUILD_SSL 16*4882a593Smuzhiyun+#define VSF_BUILD_UTMPX 17*4882a593Smuzhiyun 18*4882a593Smuzhiyun #endif /* VSF_BUILDDEFS_H */ 19*4882a593Smuzhiyun 20*4882a593Smuzhiyundiff -ru vsftpd-3.0.2.orig/sysdeputil.c vsftpd-3.0.2/sysdeputil.c 21*4882a593Smuzhiyun--- vsftpd-3.0.2.orig/sysdeputil.c 2012-09-16 06:18:04.000000000 +0200 22*4882a593Smuzhiyun+++ vsftpd-3.0.2/sysdeputil.c 2014-09-16 14:26:42.686887724 +0200 23*4882a593Smuzhiyun@@ -1158,7 +1158,7 @@ 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun #endif /* !VSF_SYSDEP_NEED_OLD_FD_PASSING */ 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun-#ifndef VSF_SYSDEP_HAVE_UTMPX 28*4882a593Smuzhiyun+#if !defined(VSF_BUILD_UTMPX) || !defined(VSF_SYSDEP_HAVE_UTMPX) 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun void 31*4882a593Smuzhiyun vsf_insert_uwtmp(const struct mystr* p_user_str, 32*4882a593Smuzhiyun@@ -1173,7 +1173,7 @@ 33*4882a593Smuzhiyun { 34*4882a593Smuzhiyun } 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun-#else /* !VSF_SYSDEP_HAVE_UTMPX */ 37*4882a593Smuzhiyun+#else /* !VSF_BUILD_UTMPX || !VSF_SYSDEP_HAVE_UTMPX */ 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun /* IMHO, the pam_unix module REALLY should be doing this in its SM component */ 40*4882a593Smuzhiyun /* Statics */ 41*4882a593Smuzhiyun@@ -1238,7 +1238,7 @@ 42*4882a593Smuzhiyun updwtmpx(WTMPX_FILE, &s_utent); 43*4882a593Smuzhiyun } 44*4882a593Smuzhiyun 45*4882a593Smuzhiyun-#endif /* !VSF_SYSDEP_HAVE_UTMPX */ 46*4882a593Smuzhiyun+#endif /* !VSF_BUILD_UTMPX || !VSF_SYSDEP_HAVE_UTMPX */ 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun void 49*4882a593Smuzhiyun vsf_set_die_if_parent_dies() 50