Merge lp:~tyhicks/ecryptfs/fix-build-system-for-lfs into lp:ecryptfs

[Tyler Hicks]

I originally set off to figure out why tests/kernel/enospc.sh was failing on
i386. It became obvious that it wasn't a filesystem bug. It turned out to be an
issue in the test case. The variable containing the file size was overflowing.

So I fixed the test up to use the proper type for file sizes (off_t). Still no
luck. I eventually figured out that I could force large file support using the
CFLAGS variable and get the test to pass.

So I was off to enable large filesystem support in our autoconf file. That
didn't work. After way too much time looking at the issue, less than half of
our source files were including config.h.

I forced the inclusion of config.h in all source files using our autoconf file.
Then I retried my enospc cleanups and everything worked!

I've built on amd64, i386, and armhf. I fixed up the new build warnings in i386
and armhf.

There's always a little concern about flipping on large file support. However,
I noticed that Debian and Ubuntu packages have been built with large file
support for some time now by overriding CFLAGS in the debian/rules file.

I've examined the build output changes between each revision on all three
architectures. I've also ran the regression tests on i386 and amd64 as well as
some manual testing. Everything should be good to. I'll push it to trunk once I
get an ACK. Thanks!

Update 1: I added r799 which includes a make check test that verifies that LFS
is enabled in the build.

[lp:~tyhicks/ecryptfs/fix-build-system-for-lfs]

799. By Tyler Hicks on 2013-10-26

* tests/userspace/lfs.sh, tests/userspace/lfs/test.c:
  - Add a test to verify that LFS is enabled. This test is run under the
    make check target.

[Colin Ian King (colin-king)]

Thanks for fixing up the issues in my tests.

I've reviewd the changes and also tested the ecryptfs tests on a 32 bit machine with a 12GB image and the enospc test works fine (as well as all the other tests). Also sanity check on a 64 bit machine.

Looks good to me. Thanks Tyler.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-07-05 15:50:00 +0000
+++ configure.ac	2013-10-26 17:18:27 +0000
@@ -16,6 +16,7 @@
 AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
 AC_CONFIG_SRCDIR([src/libecryptfs])
 AC_CONFIG_HEADERS([config.h])
+AC_SUBST(AM_CPPFLAGS, '-include $(top_builddir)/config.h')
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_DISABLE_STATIC
@@ -181,6 +182,8 @@
 	[AC_PROG_LIBTOOL]
 )
 
+AC_SYS_LARGEFILE
+
 AC_PATH_PROGS([POD2MAN], [pod2man])
 test -z "${POD2MAN}" && AC_MSG_ERROR([I couldn't find pod2man; make sure it's installed and in your path])
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-11 14:05:26 +0000
+++ debian/changelog	2013-10-26 17:18:27 +0000
@@ -29,6 +29,28 @@
       and the confirmation from stdin. Fixes a segfault (invalid memory read)
       in ecryptfs-rewrap-passphrase if there was an error while reading either
       of these passphrases.
+  * configure.ac:
+    - Set AM_CPPFLAGS to always include config.h as the first include file.
+      Some .c files correctly included config.h before anything else. The
+      majority of .c files got this wrong by including it after other header
+      files, including it multiple times, or not including it at all.
+      Including it in the AM_CPPFLAGS should solve these problems and keep
+      future mistakes from happening in new source files.
+    - Enable large file support (LFS) through the use of the AC_SYS_LARGEFILE
+      autoconf macro. ecryptfs-utils has been well tested with LFS enabled
+      because ecryptfs-utils is being built with
+      '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' in Debian-based distros.
+      This is mainly needed for some of the in-tree regression tests but
+      ecryptfs-utils, in general, should be built with LFS enabled.
+  * debian/rules:
+    - Don't append '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' to the CFLAGS
+      now that the upstream build enables LFS
+  * tests/userspace/lfs.sh, tests/userspace/lfs/test.c:
+    - Add a test to verify that LFS is enabled. This test is run under the
+      make check target.
+  * tests/kernel/enospc/test.c:
+    - Fix test failures on 32 bit architectures due to large file sizes
+      overflowing data types
 
   [ Dustin Kirkland ]
   * src/utils/ecryptfs-setup-swap: LP: #1172014

=== modified file 'debian/rules'
--- debian/rules	2013-02-20 16:58:26 +0000
+++ debian/rules	2013-10-26 17:18:27 +0000
@@ -6,8 +6,6 @@
 	TPMFLAGS = --enable-opencryptoki
 endif
 
-export DEB_CFLAGS_MAINT_APPEND = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-
 %:
 	dh ${@} --with autoreconf,python2
 

=== modified file 'src/daemon/main.c'
--- src/daemon/main.c	2013-07-05 14:52:47 +0000
+++ src/daemon/main.c	2013-10-26 17:18:27 +0000
@@ -35,7 +35,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/resource.h>
-#include "config.h"
 #include "../include/ecryptfs.h"
 
 static char *pidfile = NULL;

=== modified file 'src/key_mod/ecryptfs_key_mod_gpg.c'
--- src/key_mod/ecryptfs_key_mod_gpg.c	2009-05-02 19:39:09 +0000
+++ src/key_mod/ecryptfs_key_mod_gpg.c	2013-10-26 17:18:27 +0000
@@ -18,7 +18,6 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
 #include <fcntl.h>
 #include <pwd.h>
 #include <stdio.h>

=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-04 10:04:36 +0000
+++ src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-26 17:18:27 +0000
@@ -32,7 +32,6 @@
  * files in the program, then also delete it here.
  */
 
-#include "config.h"
 #include <fcntl.h>
 #include <pwd.h>
 #include <stdio.h>

=== modified file 'src/key_mod/ecryptfs_key_mod_passphrase.c'
--- src/key_mod/ecryptfs_key_mod_passphrase.c	2013-10-10 16:38:06 +0000
+++ src/key_mod/ecryptfs_key_mod_passphrase.c	2013-10-26 17:18:27 +0000
@@ -18,7 +18,6 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <syslog.h>

=== modified file 'src/key_mod/ecryptfs_key_mod_pkcs11_helper.c'
--- src/key_mod/ecryptfs_key_mod_pkcs11_helper.c	2012-09-25 11:40:13 +0000
+++ src/key_mod/ecryptfs_key_mod_pkcs11_helper.c	2013-10-26 17:18:27 +0000
@@ -33,7 +33,6 @@
  * files in the program, then also delete it here.
  */
 
-#include "config.h"
 #include <fcntl.h>
 #include <pwd.h>
 #include <stdio.h>

=== modified file 'src/key_mod/ecryptfs_key_mod_tspi.c'
--- src/key_mod/ecryptfs_key_mod_tspi.c	2012-02-22 03:12:04 +0000
+++ src/key_mod/ecryptfs_key_mod_tspi.c	2013-10-26 17:18:27 +0000
@@ -32,7 +32,6 @@
  * files in the program, then also delete it here.
  */
 
-#include "config.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

=== modified file 'src/libecryptfs/cmd_ln_parser.c'
--- src/libecryptfs/cmd_ln_parser.c	2013-10-04 13:24:18 +0000
+++ src/libecryptfs/cmd_ln_parser.c	2013-10-26 17:18:27 +0000
@@ -19,7 +19,6 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
 #ifndef S_SPLINT_S
 #include <sys/ioctl.h>
 #include <sys/types.h>

=== modified file 'src/libecryptfs/decision_graph.c'
--- src/libecryptfs/decision_graph.c	2013-10-04 14:27:41 +0000
+++ src/libecryptfs/decision_graph.c	2013-10-26 17:18:27 +0000
@@ -19,7 +19,6 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
 #include <errno.h>
 #include <stdint.h>
 #ifndef S_SPLINT_S

=== modified file 'src/libecryptfs/key_management.c'
--- src/libecryptfs/key_management.c	2013-06-05 18:21:43 +0000
+++ src/libecryptfs/key_management.c	2013-10-26 17:18:27 +0000
@@ -20,7 +20,6 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
 #include <errno.h>
 #include <nss.h>
 #include <pk11func.h>

=== modified file 'src/libecryptfs/key_mod.c'
--- src/libecryptfs/key_mod.c	2013-10-04 11:13:30 +0000
+++ src/libecryptfs/key_mod.c	2013-10-26 17:18:27 +0000
@@ -18,7 +18,6 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
 #include <dirent.h>
 #include <stdlib.h>
 #include <string.h>

=== modified file 'src/libecryptfs/main.c'
--- src/libecryptfs/main.c	2013-10-10 17:18:37 +0000
+++ src/libecryptfs/main.c	2013-10-26 17:18:27 +0000
@@ -19,7 +19,6 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
 #include <errno.h>
 #include <nss.h>
 #include <pk11func.h>

=== modified file 'src/libecryptfs/messaging.c'
--- src/libecryptfs/messaging.c	2012-11-02 14:31:32 +0000
+++ src/libecryptfs/messaging.c	2013-10-26 17:18:27 +0000
@@ -24,7 +24,6 @@
 #include <syslog.h>
 #include <string.h>
 #include <sys/types.h>
-#include "config.h"
 #include "../include/ecryptfs.h"
 
 /**

=== modified file 'src/libecryptfs/miscdev.c'
--- src/libecryptfs/miscdev.c	2013-10-04 10:33:17 +0000
+++ src/libecryptfs/miscdev.c	2013-10-26 17:18:27 +0000
@@ -35,7 +35,6 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "config.h"
 #include "../include/ecryptfs.h"
 
 int ecryptfs_send_miscdev(struct ecryptfs_miscdev_ctx *miscdev_ctx,

=== modified file 'src/libecryptfs/module_mgr.c'
--- src/libecryptfs/module_mgr.c	2013-06-06 09:49:57 +0000
+++ src/libecryptfs/module_mgr.c	2013-10-26 17:18:27 +0000
@@ -19,7 +19,6 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>

=== modified file 'src/libecryptfs/packets.c'
--- src/libecryptfs/packets.c	2009-02-09 15:33:25 +0000
+++ src/libecryptfs/packets.c	2013-10-26 17:18:27 +0000
@@ -29,7 +29,6 @@
 #include <unistd.h>
 #include <keyutils.h>
 #include <stdlib.h>
-#include "config.h"
 #include "../include/ecryptfs.h"
 
 #define ECRYPTFS_PACKET_STATUS_GOOD 0

=== modified file 'src/libecryptfs/sysfs.c'
--- src/libecryptfs/sysfs.c	2012-11-02 14:31:32 +0000
+++ src/libecryptfs/sysfs.c	2013-10-26 17:18:27 +0000
@@ -17,7 +17,6 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

=== modified file 'src/pam_ecryptfs/pam_ecryptfs.c'
--- src/pam_ecryptfs/pam_ecryptfs.c	2013-10-10 16:35:57 +0000
+++ src/pam_ecryptfs/pam_ecryptfs.c	2013-10-26 17:18:27 +0000
@@ -23,7 +23,6 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

=== modified file 'src/utils/Makefile.am'
--- src/utils/Makefile.am	2013-01-25 18:11:23 +0000
+++ src/utils/Makefile.am	2013-10-26 17:18:27 +0000
@@ -32,7 +32,7 @@
 bin_PROGRAMS+=ecryptfs-generate-tpm-key
 endif
 
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS += -I$(top_srcdir)/src/include
 
 mount_ecryptfs_SOURCES = mount.ecryptfs.c io.c io.h gen_key.c plaintext_decision_graph.c
 mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS)

=== modified file 'src/utils/ecryptfs_add_passphrase.c'
--- src/utils/ecryptfs_add_passphrase.c	2011-12-13 20:51:40 +0000
+++ src/utils/ecryptfs_add_passphrase.c	2013-10-26 17:18:27 +0000
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <ecryptfs.h>
-#include "config.h"
 
 void usage(void)
 {

=== modified file 'src/utils/ecryptfs_generate_tpm_key.c'
--- src/utils/ecryptfs_generate_tpm_key.c	2009-04-30 23:58:11 +0000
+++ src/utils/ecryptfs_generate_tpm_key.c	2013-10-26 17:18:27 +0000
@@ -43,7 +43,6 @@
 #include <errno.h>
 #include <trousers/tss.h>
 #include <trousers/trousers.h>
-#include "config.h"
 
 #define PRINT_ERR(x, ...) fprintf(stderr, "%s:%d Error: " x "\n", __FILE__, __LINE__, ##__VA_ARGS__)
 #define PRINT_TSS_ERR(s,r) fprintf(stderr, "%s:%d: Error: %s failed: %s\n", __FILE__, __LINE__, s, \

=== modified file 'src/utils/ecryptfs_insert_wrapped_passphrase_into_keyring.c'
--- src/utils/ecryptfs_insert_wrapped_passphrase_into_keyring.c	2011-12-13 20:51:40 +0000
+++ src/utils/ecryptfs_insert_wrapped_passphrase_into_keyring.c	2013-10-26 17:18:27 +0000
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <ecryptfs.h>
 #include <string.h>
-#include "config.h"
 
 void usage(void)
 {

=== modified file 'src/utils/ecryptfs_rewrap_passphrase.c'
--- src/utils/ecryptfs_rewrap_passphrase.c	2013-06-27 20:37:12 +0000
+++ src/utils/ecryptfs_rewrap_passphrase.c	2013-10-26 17:18:27 +0000
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <ecryptfs.h>
 #include <string.h>
-#include "config.h"
 
 void usage(void)
 {

=== modified file 'src/utils/ecryptfs_unwrap_passphrase.c'
--- src/utils/ecryptfs_unwrap_passphrase.c	2011-12-13 20:51:40 +0000
+++ src/utils/ecryptfs_unwrap_passphrase.c	2013-10-26 17:18:27 +0000
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <ecryptfs.h>
 #include <string.h>
-#include "config.h"
 
 void usage(void)
 {

=== modified file 'src/utils/ecryptfs_wrap_passphrase.c'
--- src/utils/ecryptfs_wrap_passphrase.c	2011-12-13 20:51:40 +0000
+++ src/utils/ecryptfs_wrap_passphrase.c	2013-10-26 17:18:27 +0000
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <ecryptfs.h>
 #include <string.h>
-#include "config.h"
 
 void usage(void)
 {

=== modified file 'src/utils/gen_key.c'
--- src/utils/gen_key.c	2009-02-09 15:33:25 +0000
+++ src/utils/gen_key.c	2013-10-26 17:18:27 +0000
@@ -18,7 +18,6 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>

=== modified file 'src/utils/io.c'
--- src/utils/io.c	2013-06-06 10:08:54 +0000
+++ src/utils/io.c	2013-10-26 17:18:27 +0000
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/mman.h>
-#include "config.h"
 #include "ecryptfs.h"
 #include "io.h"
 

=== modified file 'src/utils/manager.c'
--- src/utils/manager.c	2009-07-17 05:32:26 +0000
+++ src/utils/manager.c	2013-10-26 17:18:27 +0000
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
-#include "config.h"
 #include "../include/ecryptfs.h"
 #include "../include/decision_graph.h"
 #include "io.h"

=== modified file 'src/utils/mount.ecryptfs.c'
--- src/utils/mount.ecryptfs.c	2013-10-04 14:06:57 +0000
+++ src/utils/mount.ecryptfs.c	2013-10-26 17:18:27 +0000
@@ -21,7 +21,6 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
@@ -34,7 +33,6 @@
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include "config.h"
 #include "ecryptfs.h"
 #include "decision_graph.h"
 #include "io.h"

=== modified file 'src/utils/mount.ecryptfs_private.c'
--- src/utils/mount.ecryptfs_private.c	2013-06-07 13:13:23 +0000
+++ src/utils/mount.ecryptfs_private.c	2013-10-26 17:18:27 +0000
@@ -25,8 +25,6 @@
  *
  */
 
-#define _GNU_SOURCE
-
 #include <sys/file.h>
 #include <sys/mount.h>
 #include <sys/param.h>

=== modified file 'src/utils/plaintext_decision_graph.c'
--- src/utils/plaintext_decision_graph.c	2009-02-03 08:50:36 +0000
+++ src/utils/plaintext_decision_graph.c	2013-10-26 17:18:27 +0000
@@ -18,7 +18,6 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
 #include "../include/ecryptfs.h"
 #include "../include/decision_graph.h"
 

=== modified file 'src/utils/test.c'
--- src/utils/test.c	2009-02-03 08:50:36 +0000
+++ src/utils/test.c	2013-10-26 17:18:27 +0000
@@ -25,7 +25,6 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "config.h"
 #include "ecryptfs.h"
 
 #define ASSERT(EX)	                                                      \

=== modified file 'tests/kernel/enospc/test.c'
--- tests/kernel/enospc/test.c	2012-07-19 17:18:25 +0000
+++ tests/kernel/enospc/test.c	2013-10-26 17:18:27 +0000
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <limits.h>
+#include <inttypes.h>
 
 #define TEST_PASSED	(0)
 #define TEST_FAILED	(1)
@@ -34,15 +35,11 @@
 
 #define BUFF_SZ 	(65536)
 
-int test_exercise(char *filename, ssize_t size)
+int test_exercise(char *filename, off_t size)
 {
 	int fd;
-	ssize_t i;
-	ssize_t n;
 	struct stat statbuf;
-	ssize_t nbytes = size;
 	int ret = TEST_FAILED;
-
 	unsigned char buff[BUFF_SZ];
 
 	unlink(filename);
@@ -53,17 +50,16 @@
 
 	memset(buff, 0, sizeof(buff));
 
-	while (nbytes > 0) {
+	while (size > 0) {
 		int rc;
-		ssize_t n = (nbytes > BUFF_SZ) ? BUFF_SZ : nbytes;
 
-		rc = write(fd, buff, n);
+		rc = write(fd, buff, (size > BUFF_SZ) ? BUFF_SZ : size);
 		if (rc < 0) {
 			if (errno == ENOSPC)
 				ret = TEST_PASSED;
 			break;
 		}
-		nbytes -= n;
+		size -= rc;
 	}
 	/* If we got here, we didn't get ENOSPC, so we've failed */
 
@@ -80,7 +76,7 @@
 
 int main(int argc, char **argv)
 {
-	ssize_t len;
+	off_t len;
 
 	if (argc < 3) {
 		fprintf(stderr, "Syntax: %s filename size_in_K\n", argv[0]);

=== modified file 'tests/kernel/extend-file-random/test.c'
--- tests/kernel/extend-file-random/test.c	2013-03-13 14:55:11 +0000
+++ tests/kernel/extend-file-random/test.c	2013-10-26 17:18:27 +0000
@@ -26,6 +26,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <signal.h>
+#include <inttypes.h>
 
 #define	TEST_PASSED	(0)
 #define	TEST_FAILED	(1)
@@ -42,14 +43,14 @@
 int test_write(int fd, char *buffer, size_t len, off_t offset)
 {
 	if (lseek(fd, offset, SEEK_SET) < 0) {
-		fprintf(stderr, "Failed to seek to position %lu: %s\n", 
-			offset, strerror(errno));
+		fprintf(stderr, "Failed to seek to position %jd: %s\n", 
+			(intmax_t)offset, strerror(errno));
 		return TEST_FAILED;
 	}
 
 	if (write(fd, buffer, len) != len) {
-		fprintf(stderr, "Failed to write %zu bytes, position %lu: %s\n", 
-			len, offset, strerror(errno));
+		fprintf(stderr, "Failed to write %zu bytes, position %jd: %s\n",
+			len, (intmax_t)offset, strerror(errno));
 		return TEST_FAILED;
 	}
 	return TEST_PASSED;
@@ -58,14 +59,14 @@
 int test_read(int fd, char *buffer, size_t len, off_t offset)
 {
 	if (lseek(fd, offset, SEEK_SET) < 0) {
-		fprintf(stderr, "Failed to seek to position %lu: %s\n", 
-			offset, strerror(errno));
+		fprintf(stderr, "Failed to seek to position %jd: %s\n", 
+			(intmax_t)offset, strerror(errno));
 		return TEST_FAILED;
 	}
 
 	if (read(fd, buffer, len) != len) {
-		fprintf(stderr, "Failed to read %zu bytes, position %lu: %s\n", 
-			len, offset, strerror(errno));
+		fprintf(stderr, "Failed to read %zu bytes, position %jd: %s\n", 
+			len, (intmax_t)offset, strerror(errno));
 		return TEST_FAILED;
 	}
 	return TEST_PASSED;
@@ -85,7 +86,8 @@
 		return ret;
 
 	if (memcmp(buffer1, buffer2, BUF_SZ)) {
-		fprintf(stderr, "Data read is not same as data written, offset = %lu", offset);
+		fprintf(stderr, "Data read is not same as data written, offset = %jd",
+			(intmax_t)offset);
 		return TEST_FAILED;
 	}
 	return TEST_PASSED;
@@ -131,7 +133,8 @@
 			goto finish;
 
 		if (memcmp(buffer1, buffer2, BUF_SZ)) {
-			fprintf(stderr, "Data read is not same as data written, offset = %lu", offset);
+			fprintf(stderr, "Data read is not same as data written, offset = %jd",
+				(intmax_t)offset);
 			goto finish;
 		}
 	}
@@ -142,7 +145,9 @@
 	}
 
 	if (statbuf.st_size != max_offset + BUF_SZ) {
-		fprintf(stderr, "Filesize was %lu and not %lu\n", statbuf.st_size, max_offset + BUF_SZ);
+		fprintf(stderr, "Filesize was %jd and not %jd\n",
+			(intmax_t)statbuf.st_size,
+			(intmax_t)(max_offset + BUF_SZ));
 		goto finish;
 	}
 

=== modified file 'tests/kernel/llseek/test.c'
--- tests/kernel/llseek/test.c	2012-11-02 23:20:18 +0000
+++ tests/kernel/llseek/test.c	2013-10-26 17:18:27 +0000
@@ -14,6 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
+#include <inttypes.h>
 
 int main(int argc, char *argv[])
 {
@@ -43,7 +44,8 @@
 	}
 	size = lseek(fd, 4096, SEEK_END);
 	if (size != 4096) {
-		fprintf(stderr, "Expected 4096 from lseek; got [%ld]\n", size);
+		fprintf(stderr, "Expected 4096 from lseek; got [%jd]\n",
+			(intmax_t)size);
 		rc = 1;
 		goto out;
 	}
@@ -56,7 +58,8 @@
 		goto out;
 	}
 	if (s.st_size != 0) {
-		fprintf(stderr, "Filesize is [%ld]; expected 0\n", s.st_size);
+		fprintf(stderr, "Filesize is [%jd]; expected 0\n",
+			(intmax_t)s.st_size);
 		rc = 1;
 		goto out;
 	}
@@ -74,35 +77,38 @@
 		goto out;
 	}
 	if ((size = lseek(fd, 4096, SEEK_END)) != 4096) {
-		fprintf(stderr, "Expected 4096 from lseek; got [%ld]\n", size);
+		fprintf(stderr, "Expected 4096 from lseek; got [%jd]\n",
+			(intmax_t)size);
 		rc = 1;
 		goto out;
 	}
 	if ((size = write(fd, (char *)&deadbeef, 4)) != 4) {
-		fprintf(stderr, "Expected a write of 4 bytes; got [%ld] "
-			"instead\n", size);
+		fprintf(stderr, "Expected a write of 4 bytes; got [%jd] "
+			"instead\n", (intmax_t)size);
 		rc = 1;
 		goto out;
 	}
 	if ((size = lseek(fd, 5120, SEEK_SET)) != 5120) {
-		fprintf(stderr, "Expected 5120 from lseek; got [%ld]\n", size);
+		fprintf(stderr, "Expected 5120 from lseek; got [%jd]\n",
+			(intmax_t)size);
 		rc = 1;
 		goto out;
 	}
 	if ((size = write(fd, (char *)&baadf00d, 4)) != 4) {
-		fprintf(stderr, "Expected a write of 4 bytes; got [%ld] "
-			"instead\n", size);
+		fprintf(stderr, "Expected a write of 4 bytes; got [%jd] "
+			"instead\n", (intmax_t)size);
 		rc = 1;
 		goto out;
 	}
 	if ((size = lseek(fd, 4096, SEEK_SET)) != 4096) {
-		fprintf(stderr, "Expected 4096 from lseek; got [%ld]\n", size);
+		fprintf(stderr, "Expected 4096 from lseek; got [%jd]\n",
+			(intmax_t)size);
 		rc = 1;
 		goto out;
 	}
 	if ((size = read(fd, buf, 4)) != 4) {
 		fprintf(stderr, "Error attempting to read data. Expected "
-			"[%d] bytes; read [%ld] instead\n", 4, size);
+			"[%d] bytes; read [%jd] instead\n", 4, (intmax_t)size);
 		rc = 1;
 		goto out;
 	}
@@ -113,7 +119,8 @@
 	}
 	if ((size = read(fd, buf, 1020)) != 1020) {
 		fprintf(stderr, "Error attempting to read data. Expected "
-			"[%d] bytes; read [%ld] instead\n", 1020, size);
+			"[%d] bytes; read [%jd] instead\n", 1020,
+			(intmax_t)size);
 		rc = 1;
 		goto out;
 	}
@@ -126,7 +133,7 @@
 		}
 	if ((size = read(fd, buf, 4)) != 4) {
 		fprintf(stderr, "Error attempting to read data. Expected "
-			"[%d] bytes; read [%ld] instead\n", 4, size);
+			"[%d] bytes; read [%jd] instead\n", 4, (intmax_t)size);
 		rc = 1;
 		goto out;
 	}
@@ -137,18 +144,20 @@
 	}
 	if ((size = read(fd, buf, 1)) != 0) {
 		fprintf(stderr, "Error attempting to read data. Expected "
-			"[%d] bytes; read [%ld] instead\n", 0, size);
+			"[%d] bytes; read [%jd] instead\n", 0, (intmax_t)size);
 		rc = 1;
 		goto out;
 	}
 	if ((size = lseek(fd, 0, SEEK_SET)) != 0) {
-		fprintf(stderr, "Expected 0 from lseek; got [%ld]\n", size);
+		fprintf(stderr, "Expected 0 from lseek; got [%jd]\n",
+			(intmax_t)size);
 		rc = 1;
 		goto out;
 	}
 	if ((size = read(fd, buf, 4096)) != 4096) {
 		fprintf(stderr, "Error attempting to read data. Expected "
-			"[%d] bytes; read [%ld] instead\n", 4096, size);
+			"[%d] bytes; read [%jd] instead\n", 4096,
+			(intmax_t)size);
 		rc = 1;
 		goto out;
 	}
@@ -168,8 +177,8 @@
 		goto out;
 	}
 	if (s.st_size != 5124) {
-		fprintf(stderr, "Filesize is [%ld]; expected 5124\n",
-			s.st_size);
+		fprintf(stderr, "Filesize is [%jd]; expected 5124\n",
+			(intmax_t)s.st_size);
 		rc = 1;
 		goto out;
 	}
@@ -182,7 +191,8 @@
 	}
 	if ((size = read(fd, buf, 4096)) != 4096) {
 		fprintf(stderr, "Error attempting to read data. Expected "
-			"[%d] bytes; read [%ld] instead\n", 4096, size);
+			"[%d] bytes; read [%jd] instead\n", 4096,
+			(intmax_t)size);
 		rc = 1;
 		goto out;
 	}
@@ -195,7 +205,7 @@
 		}
 	if ((size = read(fd, buf, 4)) != 4) {
 		fprintf(stderr, "Error attempting to read data. Expected "
-			"[%d] bytes; read [%ld] instead\n", 4, size);
+			"[%d] bytes; read [%jd] instead\n", 4, (intmax_t)size);
 		rc = 1;
 		goto out;
 	}
@@ -206,7 +216,8 @@
 	}
 	if ((size = read(fd, buf, 1020)) != 1020) {
 		fprintf(stderr, "Error attempting to read data. Expected "
-			"[%d] bytes; read [%ld] instead\n", 1020, size);
+			"[%d] bytes; read [%jd] instead\n", 1020,
+			(intmax_t)size);
 		rc = 1;
 		goto out;
 	}
@@ -219,7 +230,7 @@
 		}
 	if ((size = read(fd, buf, 4)) != 4) {
 		fprintf(stderr, "Error attempting to read data. Expected "
-			"[%d] bytes; read [%ld] instead\n", 4, size);
+			"[%d] bytes; read [%jd] instead\n", 4, (intmax_t)size);
 		rc = 1;
 		goto out;
 	}
@@ -230,7 +241,7 @@
 	}
 	if ((size = read(fd, buf, 1)) != 0) {
 		fprintf(stderr, "Error attempting to read data. Expected "
-			"[%d] bytes; read [%ld] instead\n", 0, size);
+			"[%d] bytes; read [%jd] instead\n", 0, (intmax_t)size);
 		rc = 1;
 		goto out;
 	}

=== modified file 'tests/userspace/Makefile.am'
--- tests/userspace/Makefile.am	2012-11-03 18:51:43 +0000
+++ tests/userspace/Makefile.am	2013-10-26 17:18:27 +0000
@@ -1,8 +1,8 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 # Only place tests worth of 'make check' here. All other tests are noinst.
-dist_check_SCRIPTS = verify-passphrase-sig.sh
-check_PROGRAMS = verify-passphrase-sig/test
+dist_check_SCRIPTS = lfs.sh verify-passphrase-sig.sh
+check_PROGRAMS = lfs/test verify-passphrase-sig/test
 
 dist_noinst_DATA = tests.rc
 
@@ -14,11 +14,13 @@
 		  wrap-unwrap/test
 endif
 
+lfs_test_SOURCES = lfs/test.c
+
 verify_passphrase_sig_test_SOURCES = verify-passphrase-sig/test.c
 verify_passphrase_sig_test_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
 
 wrap_unwrap_test_SOURCES = wrap-unwrap/test.c
 wrap_unwrap_test_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
 
-TESTS = verify-passphrase-sig.sh
+TESTS = lfs.sh verify-passphrase-sig.sh
 

=== added directory 'tests/userspace/lfs'
=== added file 'tests/userspace/lfs.sh'
--- tests/userspace/lfs.sh	1970-01-01 00:00:00 +0000
+++ tests/userspace/lfs.sh	2013-10-26 17:18:27 +0000
@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# lfs.sh: Test for large file support enabled builds
+# Author: Tyler Hicks <[e-mail]>
+#
+# Copyright (C) 2013 Canonical, Ltd.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation version 2
+# of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+test_script_dir=$(dirname $0)
+rc=1
+
+. ${test_script_dir}/../lib/etl_funcs.sh
+
+test_cleanup()
+{
+	exit $rc
+}
+trap test_cleanup 0 1 2 3 15
+
+# Run the test program. See its source for the details of this test.
+${test_script_dir}/lfs/test
+
+rc=$?
+exit

=== added file 'tests/userspace/lfs/test.c'
--- tests/userspace/lfs/test.c	1970-01-01 00:00:00 +0000
+++ tests/userspace/lfs/test.c	2013-10-26 17:18:27 +0000
@@ -0,0 +1,46 @@
+/*
+ * Author: Tyler Hicks <[e-mail]>
+ *
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/*
+ * This test is to ensure that off_t is the same size as off64_t in all
+ * ecryptfs-utils builds. On 64 bit machines, this is the default. On 32 bit
+ * machines, the build system must define special variables to enable what is
+ * known as Large File Support (LFS).
+ *
+ * In configure.ac, we enable LFS by using the AC_SYS_LARGEFILE autoconf macro.
+ * It defines _FILE_OFFSET_BITS=64, when needed by the target architecture, in
+ * config.h. Also in configure.ac, we force all .c files to #include config.h
+ * so the entire ecryptfs-utils build should always have LFS enabled.
+ *
+ * IMPORTANT: We intentionally do not include config.h in this file, because it
+ * is expected that the build system automatically does it for us. This test
+ * verifies that the inclusion on config.h happens.
+ *
+ * We must define _LARGEFILE64_SOURCE in this file so that off64_t is
+ * available. However, defining it does not enable large file support.
+ */
+
+#define _LARGEFILE64_SOURCE 1
+#include <sys/types.h>
+
+int main(void)
+{
+	return sizeof(off_t) == sizeof(off64_t) ? 0 : 1;
+}

=== modified file 'tests/userspace/tests.rc'
--- tests/userspace/tests.rc	2012-11-02 23:20:18 +0000
+++ tests/userspace/tests.rc	2013-10-26 17:18:27 +0000
@@ -1,1 +1,1 @@
-safe="verify-passphrase-sig.sh wrap-unwrap.sh"
+safe="lfs.sh verify-passphrase-sig.sh wrap-unwrap.sh"