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

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

Browse Source
This commit is contained in:
Jeremy Allison 2010-02-17 16:40:28 -08:00
parent 7202dcdcc0
commit 38c50c7027
1 changed files with 6 additions and 4 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,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);