summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-02-07 22:06:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:35 -0500
commitd09914d218c53b92ffcd4a276c3ce3f33ef5389f (patch)
treed522cbb4f367479c07092f8804b204f64b6302d3 /source3/smbd
parent702dff415dec9987bfda2310e171b71d4961e5e9 (diff)
downloadsamba-d09914d218c53b92ffcd4a276c3ce3f33ef5389f.tar.gz
samba-d09914d218c53b92ffcd4a276c3ce3f33ef5389f.tar.bz2
samba-d09914d218c53b92ffcd4a276c3ce3f33ef5389f.zip
r5268: Fix bug #2310, only do 16-bit normalization on small dfree
request. Jeremy. (This used to be commit 96dfec739a7ab6ac082d530ca2b771f9d6acabc6)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/dfree.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/dfree.c b/source3/smbd/dfree.c
index f93cdf3791..c556c8c8ab 100644
--- a/source3/smbd/dfree.c
+++ b/source3/smbd/dfree.c
@@ -36,11 +36,11 @@ static void disk_norm(BOOL small_query, SMB_BIG_UINT *bsize,SMB_BIG_UINT *dfree,
errors */
}
- while (*dfree > WORDMAX || *dsize > WORDMAX || *bsize < 512) {
- *dfree /= 2;
- *dsize /= 2;
- *bsize *= 2;
- if(small_query) {
+ if(small_query) {
+ while (*dfree > WORDMAX || *dsize > WORDMAX || *bsize < 512) {
+ *dfree /= 2;
+ *dsize /= 2;
+ *bsize *= 2;
/*
* Force max to fit in 16 bit fields.
*/