Changeset 988 for vendor/current/source3/lib/sysquotas.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/lib/sysquotas.c (modified) (8 diffs)

vendor/current/source3/lib/sysquotas.c

@@ -31 +31 @@
 #elif defined(HAVE_QUOTACTL_4B)
 
-#error HAVE_QUOTACTL_4B not implemeted
-
 /*#endif HAVE_QUOTACTL_4B */
 #elif defined(HAVE_QUOTACTL_3)
@@ -175 +173 @@
         int (*set_quota)(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp);
 } sys_quota_backends[] = {
-#ifdef HAVE_XFS_QUOTAS
+#if defined HAVE_XFS_QUOTAS
         {"xfs", sys_get_xfs_quota,      sys_set_xfs_quota},
         {"gfs", sys_get_xfs_quota,      sys_set_xfs_quota},
@@ -192 +190 @@
         char **lines = NULL;
 
-        get_quota_command = lp_get_quota_command();
+        get_quota_command = lp_get_quota_command(talloc_tos());
         if (get_quota_command && *get_quota_command) {
                 const char *p;
@@ -213 +211 @@
                 }
 
-                if (asprintf(&syscmd, "%s \"%s\" %d %d",
+                if (asprintf(&syscmd, "%s %s %d %d",
                         get_quota_command, path, qtype, _id) < 0) {
                         return -1;
@@ -230 +228 @@
                         /* we need to deal with long long unsigned here, if supported */
 
-                        dp->qflags = (enum SMB_QUOTA_TYPE)strtoul(line, &p2, 10);
+                        dp->qflags = strtoul(line, &p2, 10);
                         p = p2;
                         while (p && *p && isspace(*p)) {
@@ -336 +334 @@
         const char *set_quota_command;
 
-        set_quota_command = lp_set_quota_command();
+        set_quota_command = lp_set_quota_command(talloc_tos());
         if (set_quota_command && *set_quota_command) {
                 char **lines = NULL;
@@ -356 +354 @@
 
                 if (asprintf(&syscmd,
-                        "%s \"%s\" %d %d "
+                        "%s %s %d %d "
                         "%u %llu %llu "
                         "%llu %llu %llu ",
@@ -411 +409 @@
 
         errno = 0;
-        DEBUG(10,("sys_get_quota() uid(%u, %u)\n", (unsigned)getuid(), (unsigned)geteuid()));
+        DEBUG(10,("sys_get_quota() uid(%u, %u), fs(%s)\n", (unsigned)getuid(), (unsigned)geteuid(), fs));
 
         for (i=0;(fs && sys_quota_backends[i].name && sys_quota_backends[i].get_quota);i++) {