diff options
| author | Jeremy Allison <jra@samba.org> | 1998-11-06 18:40:51 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-11-06 18:40:51 +0000 |
| commit | 4bd1feb68c4f5134293d87433da932c20cded915 (patch) | |
| tree | d25363592d47b9ef33a44af17d1852f5c8ae4a94 /source3/smbd/dfree.c | |
| parent | 675e92301c5786ecaea29025598c76c5d7967c8b (diff) | |
| download | samba-4bd1feb68c4f5134293d87433da932c20cded915.tar.gz samba-4bd1feb68c4f5134293d87433da932c20cded915.tar.bz2 samba-4bd1feb68c4f5134293d87433da932c20cded915.zip | |
lib/charcnv.c: Improved debug comment.
libsmb/namequery.c: Fix to remove 2 second wait is we are doing a unicast
and got a reply.
smbd/dfree.c:
smbd/noquotas.c:
smbd/quotas.c: Fixes from Dejan Ilic <svedja@lysator.liu.se> for the quota
code.
utils/smbpasswd.c: Fixes to allow smbpasswd to be called from swat.
Jeremy.
(This used to be commit b5981c0149ad8c6f13ea87db450080616538b5d5)
Diffstat (limited to 'source3/smbd/dfree.c')
| -rw-r--r-- | source3/smbd/dfree.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source3/smbd/dfree.c b/source3/smbd/dfree.c index c96a599e77..020386645c 100644 --- a/source3/smbd/dfree.c +++ b/source3/smbd/dfree.c @@ -188,13 +188,24 @@ static int fsusage(const char *path, SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize) static SMB_BIG_UINT disk_free(char *path,SMB_BIG_UINT *bsize,SMB_BIG_UINT *dfree,SMB_BIG_UINT *dsize) { int dfree_retval; + SMB_BIG_UINT dfree_q = 0; + SMB_BIG_UINT bsize_q = 0; + SMB_BIG_UINT dsize_q = 0; (*dfree) = (*dsize) = 0; (*bsize) = 512; fsusage(path, dfree, dsize); + if (disk_quotas(path, &bsize_q, &dfree_q, &dsize_q)) { + (*bsize) = bsize_q; + (*dfree) = MIN(*dfree,dfree_q); + (*dsize) = MIN(*dsize,dsize_q); + } + + /* FIXME : Any reason for this assumption ? */ if (*bsize < 256) { + DEBUG(5,("disk_free:Warning: bsize == %d < 256 . Changing to assumed correct bsize = 512\n",*bsize)); *bsize = 512; } |