diff options
| author | Jeremy Allison <jra@samba.org> | 2006-02-01 04:14:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:06:20 -0500 |
| commit | 86c9bac4c31df1606e3758ec42672506dde26cc6 (patch) | |
| tree | 1b0c707e273f3d44adb2ea3c4e87090d1cc99313 /source3/smbd/close.c | |
| parent | 0e551cd5a2f468ad297f1bfbccbc9f91579dc794 (diff) | |
| download | samba-86c9bac4c31df1606e3758ec42672506dde26cc6.tar.gz samba-86c9bac4c31df1606e3758ec42672506dde26cc6.tar.bz2 samba-86c9bac4c31df1606e3758ec42672506dde26cc6.zip | |
r13274: Fix for bug #3467. Not a show stopper.
jason qian <jason@infrant.com> was a *fantastic*
help in tracking this down.
Jeremy.
(This used to be commit 9f4a9c70fa232047868e5d8a3f132a2dd6bfee82)
Diffstat (limited to 'source3/smbd/close.c')
| -rw-r--r-- | source3/smbd/close.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c index c0d87b1b21..d284c82f44 100644 --- a/source3/smbd/close.c +++ b/source3/smbd/close.c @@ -209,7 +209,7 @@ static int close_normal_file(files_struct *fsp, BOOL normal_close) DEBUG(0, ("close_file: Could not delete share entry for file %s\n", fsp->fsp_name)); } - delete_file = lck->delete_on_close; + delete_file = (lck->delete_on_close | lck->initial_delete_on_close); if (delete_file) { int i; @@ -345,7 +345,7 @@ static int close_directory(files_struct *fsp, BOOL normal_close) DEBUG(0, ("close_directory: Could not delete share entry for %s\n", fsp->fsp_name)); } - delete_dir = lck->delete_on_close; + delete_dir = (lck->delete_on_close | lck->initial_delete_on_close); talloc_free(lck); |