summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2012-04-04 14:57:12 -0700
committerJeremy Allison <jra@samba.org>2012-04-05 01:36:04 +0200
commit704ea4729b499ae2716cfe6ad5d952bcb1251a3b (patch)
treed93945ca7b0fcf0257b9494636e894be52c66451
parentc10ed730d481e3d5b6710999b11b8e6969e1c16e (diff)
downloadsamba-704ea4729b499ae2716cfe6ad5d952bcb1251a3b.tar.gz
samba-704ea4729b499ae2716cfe6ad5d952bcb1251a3b.tar.bz2
samba-704ea4729b499ae2716cfe6ad5d952bcb1251a3b.zip
Third part of fix for bug #8837 - smbd crashes when deleting directory and veto files are enabled.
Use correct check to see if veto files has been enabled. Even if not set lp_veto_files() returns a valid string address (to a '\0' character). Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Thu Apr 5 01:36:04 CEST 2012 on sn-devel-104
-rw-r--r--source3/smbd/close.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 8b91da81d5..da6d8483a1 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -870,7 +870,7 @@ static NTSTATUS rmdir_internals(TALLOC_CTX *ctx, files_struct *fsp)
return NT_STATUS_OK;
}
- if(((errno == ENOTEMPTY)||(errno == EEXIST)) && lp_veto_files(SNUM(conn))) {
+ if(((errno == ENOTEMPTY)||(errno == EEXIST)) && *lp_veto_files(SNUM(conn))) {
/*
* Check to see if the only thing in this directory are
* vetoed files/directories. If so then delete them and