summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-03-02 03:51:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:18:21 -0500
commit1702791ba284b5a1e8924a65f1496d017bdb141e (patch)
treeee628a6946892708406452bc0d0b3218dda0bd10
parentcba9ad6633ae1b3eac1fc590746ced67e4d9ed33 (diff)
downloadsamba-1702791ba284b5a1e8924a65f1496d017bdb141e.tar.gz
samba-1702791ba284b5a1e8924a65f1496d017bdb141e.tar.bz2
samba-1702791ba284b5a1e8924a65f1496d017bdb141e.zip
r21647: Allow unit on for size parameters.
(This used to be commit 4d5654a8ab491364be5fd83e9894e9a46401f0f4)
-rw-r--r--source3/modules/vfs_recycle.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index cc0a2a10e2..b417b9cbff 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -157,7 +157,8 @@ static SMB_OFF_T recycle_maxsize(vfs_handle_struct *handle)
{
SMB_OFF_T maxsize;
- maxsize = lp_parm_ulong(SNUM(handle->conn), "recycle", "maxsize", 0);
+ maxsize = conv_str_size(lp_parm_const_string(SNUM(handle->conn),
+ "recycle", "maxsize", NULL));
DEBUG(10, ("recycle: maxsize = %lu\n", maxsize));
@@ -168,7 +169,8 @@ static SMB_OFF_T recycle_minsize(vfs_handle_struct *handle)
{
SMB_OFF_T minsize;
- minsize = lp_parm_ulong(SNUM(handle->conn), "recycle", "minsize", 0);
+ minsize = conv_str_size(lp_parm_const_string(SNUM(handle->conn),
+ "recycle", "minsize", NULL));
DEBUG(10, ("recycle: minsize = %lu\n", minsize));