The branch, v4-0-test has been updated
via 20cb7de Fix bug #9674 - Samba denies owner Read Control when there
is a DENY entry while W2K08 does not.
via ff658bb s3:rpc_client fix a crash
from 0dc05cc build/autoconf: put ld check variable in quotes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 20cb7defe9b6591c0156bcb5b53f4451a96a728e
Author: Richard Sharpe <[email protected]>
Date: Sat Feb 23 08:41:27 2013 -0800
Fix bug #9674 - Samba denies owner Read Control when there is a DENY entry
while W2K08 does not.
Signed-off-by: Richard Sharpe <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Sat Feb 23 19:28:15 CET 2013 on sn-devel-104
(cherry picked from commit 3e5acc155bb7be5c531a4a35b16e040f71f628ac)
Autobuild-User(v4-0-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-0-test): Tue Feb 26 10:33:48 CET 2013 on sn-devel-104
commit ff658bb36c28c9db91fc80a68725e893ffe300aa
Author: Christian Ambach <[email protected]>
Date: Wed Feb 20 16:59:05 2013 +0100
s3:rpc_client fix a crash
state->cli->dc does not have to be set (e.g. when running
net rpc join against an older Samba PDC), so check it before dereferencing
it
This fixes Bug 9669 - net rpc join crashes against a Samba 3.0.33 PDC
Bug: https://bugzilla.samba.org/show_bug.cgi?id=9669
Signed-off-by: Christian Ambach <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Christian Ambach <[email protected]>
Autobuild-Date(master): Wed Feb 20 19:00:52 CET 2013 on sn-devel-104
(cherry picked from commit 3d29bb2d37b02909ecb500e864f3c13e06957a86)
-----------------------------------------------------------------------
Summary of changes:
libcli/security/access_check.c | 6 +++---
source3/rpc_client/cli_pipe.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/security/access_check.c b/libcli/security/access_check.c
index 936ffca..2425e8a 100644
--- a/libcli/security/access_check.c
+++ b/libcli/security/access_check.c
@@ -243,6 +243,9 @@ NTSTATUS se_access_check(const struct security_descriptor
*sd,
}
}
+ /* Explicitly denied bits always override */
+ bits_remaining |= explicitly_denied_bits;
+
/* The owner always gets owner rights as defined above. */
if (security_token_has_sid(token, sd->owner_sid)) {
if (owner_rights_default) {
@@ -258,9 +261,6 @@ NTSTATUS se_access_check(const struct security_descriptor
*sd,
}
}
- /* Explicitly denied bits always override */
- bits_remaining |= explicitly_denied_bits;
-
/*
* We check privileges here because they override even DENY entries.
*/
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 61e6cce..24d69ff 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -1805,7 +1805,7 @@ static void rpc_pipe_bind_step_two_done(struct tevent_req
*subreq)
status = dcerpc_netr_LogonGetCapabilities_r_recv(subreq, talloc_tos());
TALLOC_FREE(subreq);
if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
- if (state->cli->dc->negotiate_flags &
+ if (state->cli->dc && state->cli->dc->negotiate_flags &
NETLOGON_NEG_SUPPORTS_AES) {
DEBUG(5, ("AES is not supported and the error was %s\n",
nt_errstr(status)));
--
Samba Shared Repository
