[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  9abce9f... Revert "Got back to 16-byte padding on auth RPC. S3 clients and servers now cope with this. Jeremy"
      from  867daf6... s3-selftest: finally enable RPC-SPOOLSS-PRINTER against Samba 3.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9abce9f7c95e5b98acff990ff0f7d4adec31282f
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Feb 17 19:42:49 2010 -0800

    Revert "Got back to 16-byte padding on auth RPC. S3 clients and servers now cope with this. Jeremy"
    
    This reverts commit 38c50c7027d2a2a9a3df060b74b2a2efce4d9e6f.
    
    As tridge requested, we need this to work with older S3
    servers, not just for smbtorture4.
    
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source4/librpc/rpc/dcerpc_util.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 22d874c..9dabb54 100644
--- 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);


-- 
Samba Shared Repository