The branch, master has been updated
via 38c50c7... Got back to 16-byte padding on auth RPC. S3 clients and
servers now cope with this. Jeremy
from 7202dcd... s4:param Modify secrets_get_domain_sid to give more
useful errors
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 38c50c7027d2a2a9a3df060b74b2a2efce4d9e6f
Author: Jeremy Allison <[email protected]>
Date: Wed Feb 17 16:40:28 2010 -0800
Got back to 16-byte padding on auth RPC. S3 clients and servers now cope
with this. Jeremy
-----------------------------------------------------------------------
Summary of changes:
source4/librpc/rpc/dcerpc_util.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 9dabb54..22d874c 100644
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -83,10 +83,9 @@ NTSTATUS ncacn_push_auth(DATA_BLOB *blob, TALLOC_CTX
*mem_ctx,
}
if (auth_info) {
-#if 0
- /* the s3 rpc server doesn't handle auth padding in
- bind requests. Use zero auth padding to keep us
- working with old servers */
+#if 1
+ /* With the fix for bug #7146 S3 servers
+ now cope with this. JRA. */
uint32_t offset = ndr->offset;
ndr_err = ndr_push_align(ndr, 16);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -94,6 +93,9 @@ NTSTATUS ncacn_push_auth(DATA_BLOB *blob, TALLOC_CTX *mem_ctx,
}
auth_info->auth_pad_length = ndr->offset - offset;
#else
+ /* Older s3 rpc servers doesn't handle auth padding in
+ bind requests. Use zero auth padding to keep us
+ working with old servers */
auth_info->auth_pad_length = 0;
#endif
ndr_err = ndr_push_dcerpc_auth(ndr, NDR_SCALARS|NDR_BUFFERS,
auth_info);
--
Samba Shared Repository
