[SCM] Samba Shared Repository - branch master updated
Björn Jacke
bjacke at samba.org
Sat Sep 1 17:01:01 MDT 2012
The branch, master has been updated
via d392485 s3: add sysquotas_4B support
from d5f845c s3: Make an if statement a bit easier to read
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d3924859191ee07a7e52420aa03be3204e291b60
Author: Björn Jacke <bj at sernet.de>
Date: Sun Jul 1 14:35:55 2012 +0200
s3: add sysquotas_4B support
this is from James Peach's darwin patch, that exists since a couple of years
already.
Autobuild-User(master): Björn Jacke <bj at sernet.de>
Autobuild-Date(master): Sun Sep 2 01:00:41 CEST 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 2 +-
source3/configure.in | 1 -
source3/lib/sysquotas.c | 2 -
source3/lib/sysquotas_4B.c | 222 ++++++++++++++++++++++++++++++++++++++++++++
source3/tests/sysquotas.c | 4 +
5 files changed, 227 insertions(+), 4 deletions(-)
create mode 100644 source3/lib/sysquotas_4B.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index c71d588..b448c02 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -951,7 +951,7 @@ SMBD_OBJ_SRV = smbd/server_reload.o \
rpc_server/lsasd.o \
printing/printspoolss.o printing/spoolssd.o \
lib/sysquotas.o lib/sysquotas_linux.o \
- lib/sysquotas_xfs.o lib/sysquotas_4A.o \
+ lib/sysquotas_xfs.o lib/sysquotas_4A.o lib/sysquotas_4B.o \
lib/sysquotas_nfs.o \
lib/smbd_shim.o \
lib/background.o \
diff --git a/source3/configure.in b/source3/configure.in
index db7df4d..67ccad6 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4707,7 +4707,6 @@ AC_TRY_RUN_STRICT([
#include "${srcdir-.}/../tests/sysquotas.c"],[$CFLAGS $Werror_FLAGS],[$CPPFLAGS],[$LDFLAGS],
samba_cv_HAVE_QUOTACTL_4B=yes,samba_cv_HAVE_QUOTACTL_4B=no,samba_cv_HAVE_QUOTACTL_4B=cross)])
if test x"$samba_cv_HAVE_QUOTACTL_4B" = x"yes"; then
- echo "int quotactl(const char *path, int cmd, int id, char *addr) is not reworked for the new sys_quota api"
samba_cv_SYSQUOTA_FOUND=yes;
AC_DEFINE(HAVE_QUOTACTL_4B,1,[Whether int quotactl(const char *path, int cmd, int id, char *addr) is available])
samba_cv_sysquotas_file="lib/sysquotas_4B.c"
diff --git a/source3/lib/sysquotas.c b/source3/lib/sysquotas.c
index 08f8444..ecd5147 100644
--- a/source3/lib/sysquotas.c
+++ b/source3/lib/sysquotas.c
@@ -30,8 +30,6 @@
/*#endif HAVE_QUOTACTL_4A */
#elif defined(HAVE_QUOTACTL_4B)
-#error HAVE_QUOTACTL_4B not implemeted
-
/*#endif HAVE_QUOTACTL_4B */
#elif defined(HAVE_QUOTACTL_3)
diff --git a/source3/lib/sysquotas_4B.c b/source3/lib/sysquotas_4B.c
new file mode 100644
index 0000000..9badd3b
--- /dev/null
+++ b/source3/lib/sysquotas_4B.c
@@ -0,0 +1,222 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * System QUOTA function wrappers for QUOTACTL_4B
+
+ * Copyright (C) 2011 James Peach.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "includes.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_QUOTA
+
+#ifndef HAVE_SYS_QUOTAS
+#undef HAVE_QUOTACTL_4B
+#endif
+
+#ifdef HAVE_QUOTACTL_4B
+/* int quotactl(const char *path, int cmd, int id, char *addr)
+ *
+ * This is used by many (all?) BSD-derived systems. This implementation has
+ * been developed and tested on Darwin, but may also work on other BSD systems.
+ */
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_QUOTA_H
+#include <sys/quota.h>
+#endif
+
+/* WorkARound broken HFS access checks in hfs_quotactl. */
+#define HFS_QUOTACTL_WAR 1
+
+static void xlate_qblk_to_smb(const struct dqblk * const qblk,
+ SMB_DISK_QUOTA *dp)
+{
+ ZERO_STRUCTP(dp);
+
+ DEBUG(10, ("unix softlimit=%u hardlimit=%u curblock=%u\n",
+ (unsigned)qblk->dqb_bsoftlimit, (unsigned)qblk->dqb_bhardlimit,
+ (unsigned)qblk->dqb_curbytes));
+
+ DEBUGADD(10, ("unix softinodes=%u hardinodes=%u curinodes=%u\n",
+ (unsigned)qblk->dqb_isoftlimit, (unsigned)qblk->dqb_ihardlimit,
+ (unsigned)qblk->dqb_curinodes));
+
+ /* On Darwin, quotas are counted in bytes. We report them
+ * in 512b blocks because various callers have assumptions
+ * about the block size.
+ */
+#define XLATE_TO_BLOCKS(bytes) (((bytes) + 1) / 512)
+ dp->bsize = 512;
+
+ dp->softlimit = XLATE_TO_BLOCKS(qblk->dqb_bsoftlimit);
+ dp->hardlimit = XLATE_TO_BLOCKS(qblk->dqb_bhardlimit);
+ dp->curblocks = XLATE_TO_BLOCKS(qblk->dqb_curbytes);
+#undef XLATE_TO_BLOCKS
+
+ dp->ihardlimit = qblk->dqb_ihardlimit;
+ dp->isoftlimit = qblk->dqb_isoftlimit;
+ dp->curinodes = qblk->dqb_curinodes;
+
+ dp->qflags = QUOTAS_ENABLED | QUOTAS_DENY_DISK;
+
+ DEBUG(10, ("softlimit=%u hardlimit=%u curblock=%u\n",
+ (unsigned)dp->softlimit, (unsigned)dp->hardlimit,
+ (unsigned)dp->curblocks));
+
+ DEBUGADD(10, ("softinodes=%u hardinodes=%u curinodes=%u\n",
+ (unsigned)dp->isoftlimit, (unsigned)dp->ihardlimit,
+ (unsigned)dp->curinodes));
+
+}
+
+static void xlate_smb_to_qblk(const SMB_DISK_QUOTA * const dp,
+ struct dqblk *qblk)
+{
+ ZERO_STRUCTP(qblk);
+
+ /* On Darwin, quotas are counted in bytes. */
+ qblk->dqb_bsoftlimit = dp->softlimit * dp->bsize;
+ qblk->dqb_bhardlimit = dp->hardlimit * dp->bsize;
+ qblk->dqb_ihardlimit = dp->ihardlimit;
+ qblk->dqb_isoftlimit = dp->isoftlimit;
+}
+
+static int sys_quotactl_4B(const char * path, int cmd,
+ int id, struct dqblk *qblk)
+{
+ int ret;
+
+ /* NB: We must test GRPQUOTA here, because USRQUOTA is 0. */
+ DEBUG(10, ("%s quota for %s ID %u on %s\n",
+ (cmd & QCMD(Q_GETQUOTA, 0)) ? "getting" : "setting",
+ (cmd & QCMD(0, GRPQUOTA)) ? "group" : "user",
+ (unsigned)id, path));
+
+#ifdef HFS_QUOTACTL_WAR
+ become_root();
+#endif /* HFS_QUOTACTL_WAR */
+
+ ret = quotactl(path, cmd, id, qblk);
+ if (ret == -1) {
+ /* ENOTSUP means quota support is not compiled in. EINVAL
+ * means that quotas are not configured (commonly).
+ */
+ if (errno != ENOTSUP && errno != EINVAL) {
+ DEBUG(0, ("failed to %s quota for %s ID %u on %s: %s\n",
+ (cmd & QCMD(Q_GETQUOTA, 0)) ? "get" : "set",
+ (cmd & QCMD(0, GRPQUOTA)) ? "group" : "user",
+ (unsigned)id, path, strerror(errno)));
+ }
+
+#ifdef HFS_QUOTACTL_WAR
+ unbecome_root();
+#endif /* HFS_QUOTACTL_WAR */
+
+
+ return -1;
+ }
+
+#ifdef HFS_QUOTACTL_WAR
+ unbecome_root();
+#endif /* HFS_QUOTACTL_WAR */
+
+ return 0;
+}
+
+int sys_get_vfs_quota(const char *path, const char *bdev,
+ enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp)
+{
+ int ret;
+ struct dqblk qblk;
+
+ ZERO_STRUCT(qblk);
+
+ switch (qtype) {
+ case SMB_USER_QUOTA_TYPE:
+ /* Get quota for provided UID. */
+ ret = sys_quotactl_4B(path, QCMD(Q_GETQUOTA, USRQUOTA),
+ id.uid, &qblk);
+ break;
+ case SMB_USER_FS_QUOTA_TYPE:
+ /* Get quota for current UID. */
+ ret = sys_quotactl_4B(path, QCMD(Q_GETQUOTA, USRQUOTA),
+ geteuid(), &qblk);
+ break;
+ case SMB_GROUP_QUOTA_TYPE:
+ /* Get quota for provided GID. */
+ ret = sys_quotactl_4B(path, QCMD(Q_GETQUOTA, GRPQUOTA),
+ id.gid, &qblk);
+ break;
+ case SMB_GROUP_FS_QUOTA_TYPE:
+ /* Get quota for current GID. */
+ ret = sys_quotactl_4B(path, QCMD(Q_GETQUOTA, GRPQUOTA),
+ getegid(), &qblk);
+ break;
+ default:
+ DEBUG(0, ("cannot get unsupported quota type: %u\n",
+ (unsigned)qtype));
+ errno = ENOSYS;
+ return -1;
+ }
+
+ if (ret == -1) {
+ return -1;
+ }
+
+ xlate_qblk_to_smb(&qblk, dp);
+ dp->qtype = qtype;
+
+ return ret;
+}
+
+int sys_set_vfs_quota(const char *path, const char *bdev,
+ enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp)
+{
+ struct dqblk qblk;
+
+ xlate_smb_to_qblk(dp, &qblk);
+
+ switch (qtype) {
+ case SMB_USER_QUOTA_TYPE:
+ /* Set quota for provided UID. */
+ return sys_quotactl_4B(path, QCMD(Q_SETQUOTA, USRQUOTA),
+ id.uid, &qblk);
+ case SMB_USER_FS_QUOTA_TYPE:
+ /* Set quota for current UID. */
+ return sys_quotactl_4B(path, QCMD(Q_SETQUOTA, USRQUOTA),
+ geteuid(), &qblk);
+ case SMB_GROUP_QUOTA_TYPE:
+ /* Set quota for provided GID. */
+ return sys_quotactl_4B(path, QCMD(Q_SETQUOTA, GRPQUOTA),
+ id.gid, &qblk);
+ case SMB_GROUP_FS_QUOTA_TYPE:
+ /* Set quota for current GID. */
+ return sys_quotactl_4B(path, QCMD(Q_SETQUOTA, GRPQUOTA),
+ getegid(), &qblk);
+ default:
+ DEBUG(0, ("cannot set unsupported quota type: %u\n",
+ (unsigned)qtype));
+ errno = ENOSYS;
+ return -1;
+ }
+}
+
+#endif /* HAVE_QUOTACTL_4B */
diff --git a/source3/tests/sysquotas.c b/source3/tests/sysquotas.c
index bf16c8b..53d3a67 100644
--- a/source3/tests/sysquotas.c
+++ b/source3/tests/sysquotas.c
@@ -43,6 +43,10 @@
#elif defined(HAVE_QUOTACTL_4B)
/* int quotactl(const char *path, int cmd, int id, char *addr); */
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
#ifdef HAVE_SYS_QUOTA_H
#include <sys/quota.h>
#else /* *BSD */
--
Samba Shared Repository
More information about the samba-cvs
mailing list