summaryrefslogtreecommitdiff
path: root/source/lib/sysquotas_linux.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-09-22 01:21:12 +0000
committerGerald Carter <jerry@samba.org>2005-09-22 01:21:12 +0000
commitd826a6a9b1bb26565fe75781dddac782a4757e90 (patch)
treea0856da45373abedef604417f83489148dcf334e /source/lib/sysquotas_linux.c
parent7a42b3de7aea0f8afefefd90db7fe8f255163589 (diff)
downloadsamba-9f86becaa7c0ef00cda6f0b21a3f3483e55fa015.tar.gz
r10400: commit merge patch from jrasamba-3.0.20rc2
libsmbsharemodes added (Jermey). Linux core dump fix from (James Peach). Linux quota fixes from (metze). krb5 memory leaks from (gd). Creds fix for winbindd and server (Jeremy). winbindd recursion fix (Jeremy). winbindd builtin fix (gd) universal pw error fixes (novell). dir logic fix (Jeremy). hide dotfiles fix (Jeremy) no write to read-only shares fix (?). exclusive open fix (vl). tdb reopen fix (tridge) status display open files fix (Jeremy) posix acl null pointer crash (?) posix acl mem leak (?) mount.cifs flag fix (sfrench) smbspool error message fix (?) libsmbclient comment fix (?). 64-bit error message fixes (Jeremy).
Diffstat (limited to 'source/lib/sysquotas_linux.c')
-rw-r--r--source/lib/sysquotas_linux.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/lib/sysquotas_linux.c b/source/lib/sysquotas_linux.c
index 4c024b04cc4..28a86196e2b 100644
--- a/source/lib/sysquotas_linux.c
+++ b/source/lib/sysquotas_linux.c
@@ -24,6 +24,12 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_QUOTA
+#ifndef HAVE_SYS_QUOTAS
+#ifdef HAVE_QUOTACTL_LINUX
+#undef HAVE_QUOTACTL_LINUX
+#endif
+#endif
+
#ifdef HAVE_QUOTACTL_LINUX
#include "samba_linux_quota.h"