svn commit: samba r21647 - in branches: SAMBA_3_0/source/modules SAMBA_3_0_25/source/modules

[jpeach at samba.org]

Author: jpeach
Date: 2007-03-02 03:51:22 +0000 (Fri, 02 Mar 2007)
New Revision: 21647

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21647

Log:
Allow unit on for size parameters.

Modified:
   branches/SAMBA_3_0/source/modules/vfs_recycle.c
   branches/SAMBA_3_0_25/source/modules/vfs_recycle.c


Changeset:
Modified: branches/SAMBA_3_0/source/modules/vfs_recycle.c
===================================================================
--- branches/SAMBA_3_0/source/modules/vfs_recycle.c	2007-03-01 23:57:37 UTC (rev 21646)
+++ branches/SAMBA_3_0/source/modules/vfs_recycle.c	2007-03-02 03:51:22 UTC (rev 21647)
@@ -157,7 +157,8 @@
 {
 	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 @@
 {
 	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));
 	

Modified: branches/SAMBA_3_0_25/source/modules/vfs_recycle.c
===================================================================
--- branches/SAMBA_3_0_25/source/modules/vfs_recycle.c	2007-03-01 23:57:37 UTC (rev 21646)
+++ branches/SAMBA_3_0_25/source/modules/vfs_recycle.c	2007-03-02 03:51:22 UTC (rev 21647)
@@ -157,7 +157,8 @@
 {
 	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 @@
 {
 	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));