sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

Revert "Got back to 16-byte padding on auth RPC. S3 clients and servers now cope with this. Jeremy"

Browse Source 
This reverts commit 38c50c7027.

As tridge requested, we need this to work with older S3
servers, not just for smbtorture4.

Jeremy.
This commit is contained in:
Jeremy Allison 2010-02-17 19:42:49 -08:00
parent 867daf6e0a
commit 9abce9f7c9
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source4/librpc/rpc/dcerpc_util.c
View File

@ -83,9 +83,10 @@ NTSTATUS ncacn_push_auth(DATA_BLOB *blob, TALLOC_CTX *mem_ctx,
}
if (auth_info) {
#if 1
/* With the fix for bug #7146 S3 servers
now cope with this. JRA. */
#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 */
uint32_t offset = ndr->offset;
ndr_err = ndr_push_align(ndr, 16);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@ -93,9 +94,6 @@ 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);