[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  7b2acf8 s3:quota: don't force the block size to 512
      from  0efdbc5 Fix net rpc share allowedusers to work with 2008r2

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 7b2acf8abe50f20302e7e296dc0ccb5e0c7963de
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
    (cherry picked from commit d6cc08b9eeb9de17bc0e610d6cf6dba13c5c8222)

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

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c
index 4151662..45d87c7 100644
--- a/source3/smbd/quotas.c
+++ b/source3/smbd/quotas.c
@@ -746,9 +746,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