From: James Peach <jpeach@samba.org>
Date: Fri, 2 Mar 2007 03:51:22 +0000 (+0000)
Subject: r21647: Allow unit on for size parameters.
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~1013
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d5654a8ab491364be5fd83e9894e9a46401f0f4;p=thirdparty%2Fsamba.git

r21647: Allow unit on for size parameters.
---

diff --git a/source/modules/vfs_recycle.c b/source/modules/vfs_recycle.c
index cc0a2a10e2b..b417b9cbff8 100644
--- a/source/modules/vfs_recycle.c
+++ b/source/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));