Changeset 745 for trunk/server/source3/lib/sysquotas.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/sysquotas.c (modified) (5 diffs)

trunk/server/source3/lib/sysquotas.c

@@ -178 +178 @@
         {"xfs", sys_get_xfs_quota,      sys_set_xfs_quota},
 #endif /* HAVE_XFS_QUOTAS */
+#ifdef HAVE_NFS_QUOTAS
+        {"nfs", sys_get_nfs_quota,      sys_set_nfs_quota},
+#endif /* HAVE_NFS_QUOTAS */
         {NULL,  NULL,                   NULL}
 };
@@ -301 +304 @@
                         DEBUG (3, ("Parsed output of get_quota, ...\n"));
 
-#ifdef LARGE_SMB_OFF_T
                         DEBUGADD (5,( 
                                 "qflags:%u curblocks:%llu softlimit:%llu hardlimit:%llu\n"
@@ -310 +312 @@
                                 (long long unsigned)dp->isoftlimit,(long long unsigned)dp->ihardlimit,
                                 (long long unsigned)dp->bsize));
-#else /* LARGE_SMB_OFF_T */
-                        DEBUGADD (5,( 
-                                "qflags:%u curblocks:%lu softlimit:%lu hardlimit:%lu\n"
-                                "curinodes:%lu isoftlimit:%lu ihardlimit:%lu bsize:%lu\n", 
-                                dp->qflags,(long unsigned)dp->curblocks,
-                                (long unsigned)dp->softlimit,(long unsigned)dp->hardlimit,
-                                (long unsigned)dp->curinodes,
-                                (long unsigned)dp->isoftlimit,(long unsigned)dp->ihardlimit,
-                                (long unsigned)dp->bsize));
-#endif /* LARGE_SMB_OFF_T */
                         return 0;
                 }
@@ -360 +352 @@
                 }
 
-#ifdef LARGE_SMB_OFF_T
                 if (asprintf(&syscmd,
                         "%s \"%s\" %d %d "
@@ -371 +362 @@
                         return -1;
                 }
-#else /* LARGE_SMB_OFF_T */
-                if (asprintf(&syscmd,
-                        "%s \"%s\" %d %d "
-                        "%u %lu %lu "
-                        "%lu %lu %lu ",
-                        set_quota_command, path, qtype, _id, dp->qflags,
-                        (long unsigned)dp->softlimit,(long unsigned)dp->hardlimit,
-                        (long unsigned)dp->isoftlimit,(long unsigned)dp->ihardlimit,
-                        (long unsigned)dp->bsize) < 0) {
-                        return -1;
-                }
-#endif /* LARGE_SMB_OFF_T */
 
                 DEBUG (3, ("get_quota: Running command %s\n", syscmd));