Index: source3/configure
--- source3/configure.orig	2009-07-03 13:46:28 +0200
+++ source3/configure	2009-07-18 00:15:39 +0200
@@ -12692,6 +12692,7 @@
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/iniparser/src"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
 
 SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
@@ -75436,6 +75437,8 @@
 
 
 fi
+LIBWBCLIENT_STATIC=$LIBWBCLIENT_STATIC_TARGET
+LIBWBCLIENT_SHARED=$LIBWBCLIENT_STATIC_TARGET
 
 
 { $as_echo "$as_me:$LINENO: checking for struct ctdb_control_tcp" >&5
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-18 00:14:46 +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