[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  a3eb8d7 quota: fix build of sysquote_xfs on
      from  25bf057 nsswitch: fix crash on null pam change pw response

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit a3eb8d765e48bcbe86458791ec61325a517bd7dd
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Sep 13 01:23:12 2012 +0200

    quota: fix build of sysquote_xfs on
    
    linux header files renamed some XFS_* defines to FS_* around kernel v2.6.36
    
    This fixes bug #7814

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/sysquotas_xfs.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/sysquotas_xfs.c b/source3/lib/sysquotas_xfs.c
index 1e438e9..1e3d952 100644
--- a/source3/lib/sysquotas_xfs.c
+++ b/source3/lib/sysquotas_xfs.c
@@ -35,6 +35,18 @@
 #include "samba_linux_quota.h"
 #ifdef HAVE_LINUX_DQBLK_XFS_H
 #include <linux/dqblk_xfs.h>
+#ifndef XFS_QUOTA_UDQ_ACCT
+#define XFS_QUOTA_UDQ_ACCT FS_QUOTA_UDQ_ACCT
+#endif
+#ifndef XFS_QUOTA_UDQ_ENFD
+#define XFS_QUOTA_UDQ_ENFD FS_QUOTA_UDQ_ENFD
+#endif
+#ifndef XFS_QUOTA_GDQ_ACCT
+#define XFS_QUOTA_GDQ_ACCT FS_QUOTA_GDQ_ACCT
+#endif
+#ifndef XFS_QUOTA_GDQ_ENFD
+#define XFS_QUOTA_GDQ_ENFD FS_QUOTA_GDQ_ENFD
+#endif
 #endif
 #define HAVE_GROUP_QUOTA
 #else /* IRIX */


-- 
Samba Shared Repository