From 704ea4729b499ae2716cfe6ad5d952bcb1251a3b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 4 Apr 2012 14:57:12 -0700 Subject: 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 Autobuild-Date: Thu Apr 5 01:36:04 CEST 2012 on sn-devel-104 --- source3/smbd/close.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/smbd/close.c') 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 -- cgit