git.samba.org
/
nivanova
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7202dcd
)
Got back to 16-byte padding on auth RPC. S3 clients and servers now cope with this...
author
Jeremy Allison
<jra@samba.org>
Thu, 18 Feb 2010 00:40:28 +0000
(16:40 -0800)
committer
Jeremy Allison
<jra@samba.org>
Thu, 18 Feb 2010 00:43:11 +0000
(16:43 -0800)
source4/librpc/rpc/dcerpc_util.c
patch
|
blob
|
history
diff --git
a/source4/librpc/rpc/dcerpc_util.c
b/source4/librpc/rpc/dcerpc_util.c
index 9dabb54ca5046c15dc604b9bb48583262e22af11..22d874cbf3e4bb0b4f5b227250170aca6e406799 100644
(file)
--- 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 (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)) {
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
}
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);
auth_info->auth_pad_length = 0;
#endif
ndr_err = ndr_push_dcerpc_auth(ndr, NDR_SCALARS|NDR_BUFFERS, auth_info);