Index: source3/configure
--- source3/configure.orig	2009-07-03 13:46:28 +0200
+++ source3/configure	2009-07-19 13:39:21 +0200
@@ -78688,7 +78689,7 @@
 	LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.$SHLIBEXT
 	LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
 	LIBWBCLIENT_SOVER=0
-	if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
+	if false; then
 		NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
 		## Only worry about libwbclient if we have shared
 		# library support
Index: source3/lib/sysquotas_4A.c
--- source3/lib/sysquotas_4A.c.orig	2009-07-03 13:21:14 +0200
+++ source3/lib/sysquotas_4A.c	2009-07-19 13:37:58 +0200
@@ -71,6 +71,10 @@
 #define dqb_curinodes	dqb_curfiles
 #endif
 
+#if defined(_LINUX_QUOTA_VERSION) && _LINUX_QUOTA_VERSION-0 >= 2
+#define dqb_curblocks dqb_curspace
+#endif
+
 #ifdef INITQFNAMES
 #define USERQUOTAFILE_EXTENSION ".user"
 #else