diff options
| author | Gerald Carter <jerry@samba.org> | 2006-06-08 20:07:34 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2006-06-08 20:07:34 +0000 |
| commit | 3a5cc58fde0d53d83d46e37f80670ad6bd67f892 (patch) | |
| tree | af90a90140ba6578e973247176d40c6af54a167a /source/modules/vfs_recycle.c | |
| parent | a1b3f2f9bac039395fa20f0be779367f7e23400a (diff) | |
| download | samba-3a5cc58fde0d53d83d46e37f80670ad6bd67f892.tar.gz samba-3a5cc58fde0d53d83d46e37f80670ad6bd67f892.tar.xz samba-3a5cc58fde0d53d83d46e37f80670ad6bd67f892.zip | |
r16104: Set version to 3.0.23rc2
Bring release tree up to current 3.0 tree
(svn merge -r15845:16103 $SVNURL/branches/SAMBA_3_0)
Diffstat (limited to 'source/modules/vfs_recycle.c')
| -rw-r--r-- | source/modules/vfs_recycle.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/source/modules/vfs_recycle.c b/source/modules/vfs_recycle.c index 7b2b15171e4..42f2f51416e 100644 --- a/source/modules/vfs_recycle.c +++ b/source/modules/vfs_recycle.c @@ -181,6 +181,23 @@ static mode_t recycle_directory_mode(vfs_handle_struct *handle) return (mode_t)dirmode; } +static mode_t recycle_subdir_mode(vfs_handle_struct *handle) +{ + int dirmode; + const char *buff; + + buff = lp_parm_const_string(SNUM(handle->conn), "recycle", "subdir_mode", NULL); + + if (buff != NULL ) { + sscanf(buff, "%o", &dirmode); + } else { + dirmode=recycle_directory_mode(handle); + } + + DEBUG(10, ("recycle: subdir_mode = %o\n", dirmode)); + return (mode_t)dirmode; +} + static BOOL recycle_directory_exist(vfs_handle_struct *handle, const char *dname) { SMB_STRUCT_STAT st; @@ -270,6 +287,7 @@ static BOOL recycle_create_dir(vfs_handle_struct *handle, const char *dname) } } safe_strcat(new_dir, "/", len); + mode = recycle_subdir_mode(handle); } ret = True; |