]>
Commit | Line | Data |
---|---|---|
d1c18ff1 AM |
1 | diff -urN samba-2.2.3a.org/source/configure.in samba-2.2.3a/source/configure.in |
2 | --- samba-2.2.3a.org/source/configure.in Thu Apr 18 14:31:35 2002 | |
3 | +++ samba-2.2.3a/source/configure.in Thu Apr 18 14:56:02 2002 | |
4 | @@ -2152,7 +2152,15 @@ | |
5 | AC_TRY_COMPILE([#include <stdio.h> | |
6 | #include <sys/types.h> | |
7 | #include <asm/types.h> | |
8 | +#define __KERNEL__ | |
9 | +#include <asm/types.h> | |
10 | +#include <asm/semaphore.h> | |
11 | +#include <linux/list.h> | |
12 | +#include <linux/wait.h> | |
13 | +#include <linux/kdev_t.h> | |
14 | +#include <linux/sem.h> | |
15 | #include <linux/quota.h> | |
16 | +#undef __KERNEL__ | |
17 | #include <mntent.h> | |
18 | #include <linux/unistd.h>],[struct mem_dqblk D;], | |
19 | samba_cv_linux_2_4_quota_braindamage=yes,samba_cv_linux_2_4_quota_braindamage=no)]) | |
20 | diff -urN samba-2.2.3a.org/source/smbd/quotas.c samba-2.2.3a/source/smbd/quotas.c | |
21 | --- samba-2.2.3a.org/source/smbd/quotas.c Thu Apr 18 14:31:36 2002 | |
22 | +++ samba-2.2.3a/source/smbd/quotas.c Thu Apr 18 16:50:28 2002 | |
23 | @@ -54,6 +53,24 @@ | |
24 | * Linus synchronises with the AC patches. Sometimes I *hate* Linux :-). JRA. | |
25 | */ | |
26 | ||
27 | +#ifndef LINUX_QUOTAS_1 | |
28 | +/* | |
29 | + * Data for one user/group kept in memory | |
30 | + */ | |
31 | +typedef __u64 qsize_t; /* Type in which we store sizes */ | |
32 | + | |
33 | +struct mem_dqblk { | |
34 | + __u32 dqb_bhardlimit; /* absolute limit on disk blks alloc */ | |
35 | + __u32 dqb_bsoftlimit; /* preferred limit on disk blks */ | |
36 | + qsize_t dqb_curspace; /* current used space */ | |
37 | + __u32 dqb_ihardlimit; /* absolute limit on allocated inodes */ | |
38 | + __u32 dqb_isoftlimit; /* preferred inode limit */ | |
39 | + __u32 dqb_curinodes; /* current # allocated inodes */ | |
40 | + time_t dqb_btime; /* time limit for excessive disk use */ | |
41 | + time_t dqb_itime; /* time limit for excessive inode use */ | |
42 | +}; | |
43 | +#endif | |
44 | + | |
45 | #include <linux/quota.h> | |
46 | #ifdef HAVE_LINUX_XQM_H | |
47 | #include <linux/xqm.h> |