svn commit: samba r13223 - in trunk/source/modules: .

[idra at samba.org]

Author: idra
Date: 2006-01-29 18:36:33 +0000 (Sun, 29 Jan 2006)
New Revision: 13223

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

Log:

do not assume mode_t == int
close bug #3405

Jerry please apply this to SAMBA_3_0_RELEASE before 3.0.21b it fixes a crash bug on some freebsds when using directory_mode in the recycle module


Modified:
   trunk/source/modules/vfs_recycle.c


Changeset:
Modified: trunk/source/modules/vfs_recycle.c
===================================================================
--- trunk/source/modules/vfs_recycle.c	2006-01-29 18:22:39 UTC (rev 13222)
+++ trunk/source/modules/vfs_recycle.c	2006-01-29 18:36:33 UTC (rev 13223)
@@ -166,13 +166,13 @@
 
 static mode_t recycle_directory_mode(vfs_handle_struct *handle)
 {
-	mode_t dirmode;
+	int dirmode;
 	const char *buff;
 
 	buff = lp_parm_const_string(SNUM(handle->conn), "recycle", "directory_mode", NULL);
 
 	if (buff != NULL ) {
-		sscanf(buff, "%o", (int *)&dirmode);
+		sscanf(buff, "%o", &dirmode);
 	} else {
 		dirmode=S_IRUSR | S_IWUSR | S_IXUSR;
 	}