The branch, master has been updated
via b939144 check_name() not needed in mkdir.
via 1dfa3ee Ensure VALID_STAT before accessing fields.
from 714954c s4:torture/rap/printing: check
smbcli_rap_netprintqgetinfo() WERR status
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b939144071a874f043ca32d4a80044da1d94f2dd
Author: Jeremy Allison <[email protected]>
Date: Fri Dec 16 15:48:47 2011 -0800
check_name() not needed in mkdir.
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Sat Dec 17 02:44:55 CET 2011 on sn-devel-104
commit 1dfa3ee986820154f0908093a0e82ee8e6d84414
Author: Jeremy Allison <[email protected]>
Date: Fri Dec 16 15:48:03 2011 -0800
Ensure VALID_STAT before accessing fields.
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/open.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 86291ae..fd99994 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -99,7 +99,9 @@ NTSTATUS smbd_check_access_rights(struct connection_struct
*conn,
return NT_STATUS_OK;
}
- if (access_mask == DELETE_ACCESS && S_ISLNK(smb_fname->st.st_ex_mode)) {
+ if (access_mask == DELETE_ACCESS &&
+ VALID_STAT(smb_fname->st) &&
+ S_ISLNK(smb_fname->st.st_ex_mode)) {
/* We can always delete a symlink. */
DEBUG(10,("smbd_check_access_rights: not checking ACL "
"on DELETE_ACCESS on symlink %s.\n",
@@ -2557,11 +2559,6 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
return NT_STATUS_ACCESS_DENIED;
}
- status = check_name(conn, smb_dname->base_name);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
-
if (!parent_dirname(talloc_tos(), smb_dname->base_name, &parent_dir,
NULL)) {
return NT_STATUS_NO_MEMORY;
--
Samba Shared Repository
