diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-25 11:34:48 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-25 11:34:48 -0300 |
| commit | f8f8c2edc0a58f29e716f32453ee296980faef03 (patch) | |
| tree | 36550328b2ffc701ee93ee0d3f19f11d972e850e /testing/quota-tools/nulls.diff | |
| parent | 8b3071c77c79bbf0f373ca9b8ce0795c55d03669 (diff) | |
| parent | c52a1a6eb4ad278a7b6d9eeeb9c7c88f73ca8d8c (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/angband/PKGBUILD
community/bashburn/PKGBUILD
community/qgis/PKGBUILD
core/libldap/PKGBUILD
core/tcp_wrappers/PKGBUILD
extra/openldap/PKGBUILD
extra/speedtouch/PKGBUILD
libre/kernel26-libre/PKGBUILD
Diffstat (limited to 'testing/quota-tools/nulls.diff')
| -rw-r--r-- | testing/quota-tools/nulls.diff | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/testing/quota-tools/nulls.diff b/testing/quota-tools/nulls.diff deleted file mode 100644 index 97c5bc482..000000000 --- a/testing/quota-tools/nulls.diff +++ /dev/null @@ -1,20 +0,0 @@ -#Description: Avoid memory corruption of NULL address -#Author: Petr Pisar - ---- quota/quotasys.c 2010-02-18 09:44:11.000000000 +0100 -+++ quota-tools/quotasys.c 2010-05-05 08:02:53.000000000 +0200 -@@ -746,9 +746,12 @@ - kernel_qfmt_num = 0; - if (!stat("/proc/fs/xfs/stat", &st)) - kernel_qfmt[kernel_qfmt_num++] = QF_XFS; -- else -- if (!quotactl(QCMD(Q_XGETQSTAT, 0), NULL, 0, NULL) || (errno != EINVAL && errno != ENOSYS)) -+ else { -+ fs_quota_stat_t dummy; -+ -+ if (!quotactl(QCMD(Q_XGETQSTAT, 0), "/dev/root", 0, (void *)&dummy) || (errno != EINVAL && errno != ENOSYS)) - kernel_qfmt[kernel_qfmt_num++] = QF_XFS; -+ } - /* Detect new kernel interface; Assume generic interface unless we can prove there is not one... */ - if (!stat("/proc/sys/fs/quota", &st) || errno != ENOENT) { - kernel_iface = IFACE_GENERIC; |