[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  44fd8e7 fileserver:sysquotas: remove wrong cast
       via  d6cc08b s3:quota: don't force the block size to 512
      from  146ad30 s3-smbd: Remove remaining references to removed OS support in old-style quota code

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 44fd8e72081f168c0f75cf9fb8969fe42d1e98c9
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Sep 6 14:17:25 2012 +0200

    fileserver:sysquotas: remove wrong cast
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Thu Sep  6 17:16:30 CEST 2012 on sn-devel-104

commit d6cc08b9eeb9de17bc0e610d6cf6dba13c5c8222
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Sep 6 10:23:50 2012 +0200

    s3:quota: don't force the block size to 512
    
    there is no point in forcing the block size to 512 when curblocks is 1. This
    will only lead to false quota reporting. See bug #3272

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/sysquotas.c |    2 +-
 source3/smbd/quotas.c   |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/sysquotas.c b/source3/lib/sysquotas.c
index 84679f4..cbacc7b 100644
--- a/source3/lib/sysquotas.c
+++ b/source3/lib/sysquotas.c
@@ -225,7 +225,7 @@ static int command_get_quota(const char *path, enum SMB_QUOTA_TYPE qtype, unid_t
 
 			/* 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)) {
 				p++;
diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c
index 339952e..3d1056d 100644
--- a/source3/smbd/quotas.c
+++ b/source3/smbd/quotas.c
@@ -203,9 +203,6 @@ static bool nfs_quotas(char *nfspath, uid_t euser_id, uint64_t *bsize, uint64_t
 	*bsize = gqr.getquota_rslt_u.gqr_rquota.rq_bsize;
 	*dsize = D.dqb_bsoftlimit;
 
-	if (D.dqb_curblocks == 1)
-		*bsize = 512;
-
 	if (D.dqb_curblocks > D.dqb_bsoftlimit) {
 		*dfree = 0;
 		*dsize = D.dqb_curblocks;


-- 
Samba Shared Repository