The branch, master has been updated
via 0751495 dosmode: fix FSCTL_SET_SPARSE request validation
via 4ee65a4 Fix typo in ldbrename manpage
from d68a2eb s4:dlz_bind9: let dlz_bind9 use dns_common_lookup() before
add/modify
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0751495b1327d002b79482632b7c590cae6e3f9d
Author: David Disseldorp <dd...@samba.org>
Date: Wed Aug 27 15:42:00 2014 +0200
dosmode: fix FSCTL_SET_SPARSE request validation
Check that FSCTL_SET_SPARSE requests does not refer to directories. Also
reject such requests when issued over IPC or printer share connections.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10787
Signed-off-by: David Disseldorp <dd...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Thu Aug 28 04:22:37 CEST 2014 on sn-devel-104
commit 4ee65a4666d90bd458e451fd630410cb6142943d
Author: Marc Muehlfeld <mmuehlf...@samba.org>
Date: Sun Aug 24 19:51:15 2014 +0200
Fix typo in ldbrename manpage
Signed-off-by: Marc Muehlfeld <mmuehlf...@samba.org>
Reviewed-by: Jeremy Allson <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/man/ldbrename.1.xml | 2 +-
source3/smbd/dosmode.c | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/man/ldbrename.1.xml b/lib/ldb/man/ldbrename.1.xml
index 1fa13e6..102cee4 100644
--- a/lib/ldb/man/ldbrename.1.xml
+++ b/lib/ldb/man/ldbrename.1.xml
@@ -22,7 +22,7 @@
<arg choice="opt">-h</arg>
<arg choice="opt">-o options</arg>
<arg choice="req">olddn</arg>
- <arg choice="req">newdb</arg>
+ <arg choice="req">newdn</arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 965e695..162684b 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -886,6 +886,19 @@ NTSTATUS file_set_sparse(connection_struct *conn,
return NT_STATUS_ACCESS_DENIED;
}
+ if (fsp->is_directory) {
+ DEBUG(9, ("invalid attempt to %s sparse flag on dir %s\n",
+ (sparse ? "set" : "clear"),
+ smb_fname_str_dbg(fsp->fsp_name)));
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+ if (IS_IPC(conn) || IS_PRINT(conn)) {
+ DEBUG(9, ("attempt to %s sparse flag over invalid conn\n",
+ (sparse ? "set" : "clear")));
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
DEBUG(10,("file_set_sparse: setting sparse bit %u on file %s\n",
sparse, smb_fname_str_dbg(fsp->fsp_name)));
--
Samba Shared Repository
