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

This reverts commit 38c50c7027d2a2a9a3df060b74b2a2efce4d9e6f.

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

Jeremy.

diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 22d874cbf3e4bb0b4f5b227250170aca6e406799..9dabb54ca5046c15dc604b9bb48583262e22af11 100644 (file)
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -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);