[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-82-g23d3db0
Gerald (Jerry) Carter
jerry at samba.org
Fri Oct 19 20:57:06 GMT 2007
The branch, v3-2-test has been updated
via 23d3db0c229fe5e1d69f890d87c2be39b356ffb5 (commit)
via aae3d04e30a0e6f21f661da3dc6a2835d31ce964 (commit)
via fd28d09a95b31bdbc6babd13c5a4ed9fc9ef4bfd (commit)
from 620785df4e57b72471ff0315e22e0d2f28a2b1a5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 23d3db0c229fe5e1d69f890d87c2be39b356ffb5
Merge: aae3d04e30a0e6f21f661da3dc6a2835d31ce964 620785df4e57b72471ff0315e22e0d2f28a2b1a5
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Fri Oct 19 15:54:32 2007 -0500
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
commit aae3d04e30a0e6f21f661da3dc6a2835d31ce964
Author: Michael Adam <obnox at samba.org>
Date: Fri Oct 19 22:42:28 2007 +0200
Streamline logic, reducing the amount of indentation.
Michael
commit fd28d09a95b31bdbc6babd13c5a4ed9fc9ef4bfd
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Fri Oct 19 14:36:34 2007 -0500
Fix a crash in resolve_hosts() caused by an out-of-bounds array reference.
-----------------------------------------------------------------------
Summary of changes:
source/rpc_server/srv_srvsvc_nt.c | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_srvsvc_nt.c b/source/rpc_server/srv_srvsvc_nt.c
index 27bc807..55c30c5 100644
--- a/source/rpc_server/srv_srvsvc_nt.c
+++ b/source/rpc_server/srv_srvsvc_nt.c
@@ -2033,22 +2033,21 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC
}
nt_status = open_file_stat(conn, NULL, filename, &st, &fsp);
- if ( !NT_STATUS_IS_OK(nt_status)) {
- /* Perhaps it is a directory */
- if (NT_STATUS_EQUAL(nt_status, NT_STATUS_FILE_IS_A_DIRECTORY))
- nt_status = open_directory(conn, NULL, filename, &st,
- READ_CONTROL_ACCESS,
- FILE_SHARE_READ|FILE_SHARE_WRITE,
- FILE_OPEN,
- 0,
- FILE_ATTRIBUTE_DIRECTORY,
- NULL, &fsp);
-
- if (!NT_STATUS_IS_OK(nt_status)) {
- DEBUG(3,("_srv_net_file_query_secdesc: Unable to open file %s\n", filename));
- r_u->status = ntstatus_to_werror(nt_status);
- goto error_exit;
- }
+ /* Perhaps it is a directory */
+ if (NT_STATUS_EQUAL(nt_status, NT_STATUS_FILE_IS_A_DIRECTORY)) {
+ nt_status = open_directory(conn, NULL, filename, &st,
+ READ_CONTROL_ACCESS,
+ FILE_SHARE_READ|FILE_SHARE_WRITE,
+ FILE_OPEN,
+ 0,
+ FILE_ATTRIBUTE_DIRECTORY,
+ NULL, &fsp);
+ }
+
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ DEBUG(3,("_srv_net_file_query_secdesc: Unable to open file %s\n", filename));
+ r_u->status = ntstatus_to_werror(nt_status);
+ goto error_exit;
}
sd_size = SMB_VFS_GET_NT_ACL(fsp, fsp->fsp_name, (OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION), &psd);
--
Samba Shared Repository
More information about the samba-cvs
mailing list