diff options
| author | Simo Sorce <idra@samba.org> | 2010-07-14 11:09:04 -0400 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-07-16 01:51:17 +0200 |
| commit | ca3bdca52e93ec492f06f18d8428e80bbad375be (patch) | |
| tree | 788d753cf0fbaefee89d734b43eb4d42da78931a | |
| parent | cb3725a9310d88a8d5226025292e25d178d7a4db (diff) | |
| download | samba-ca3bdca52e93ec492f06f18d8428e80bbad375be.tar.gz samba-ca3bdca52e93ec492f06f18d8428e80bbad375be.tar.bz2 samba-ca3bdca52e93ec492f06f18d8428e80bbad375be.zip | |
s3-dcerpc: Padding is never done on a DCERPC_PKT_BIND_ACK packet.
Empirically verified against Windows.
It never pads the auth credentials on this packet type.
Signed-off-by: Günther Deschner <gd@samba.org>
| -rw-r--r-- | source3/rpc_server/srv_pipe.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index 6b85141367..12ec27bd04 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -1146,7 +1146,6 @@ bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt) struct dcerpc_ack_ctx bind_ack_ctx; DATA_BLOB auth_resp = data_blob_null; DATA_BLOB auth_blob = data_blob_null; - int pad_len = 0; /* No rebinds on a bound pipe - use alter context. */ if (p->pipe_bound) { @@ -1367,18 +1366,10 @@ bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt) if (auth_resp.length) { - /* Work out any padding needed before the auth footer. */ - pad_len = p->out_data.frag.length % SERVER_NDR_PADDING_SIZE; - if (pad_len) { - pad_len = SERVER_NDR_PADDING_SIZE - pad_len; - DEBUG(10, ("auth pad_len = %u\n", - (unsigned int)pad_len)); - } - status = dcerpc_push_dcerpc_auth(pkt, auth_type, auth_info.auth_level, - pad_len, + 0, 1, /* auth_context_id */ &auth_resp, &auth_blob); @@ -1391,22 +1382,9 @@ bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt) /* Now that we have the auth len store it into the right place in * the dcerpc header */ dcerpc_set_frag_length(&p->out_data.frag, - p->out_data.frag.length + - pad_len + - auth_blob.length); + p->out_data.frag.length + auth_blob.length); if (auth_blob.length) { - if (pad_len) { - char pad[SERVER_NDR_PADDING_SIZE]; - memset(pad, '\0', SERVER_NDR_PADDING_SIZE); - if (!data_blob_append(p->mem_ctx, &p->out_data.frag, - pad, pad_len)) { - DEBUG(0, ("api_pipe_bind_req: failed to add " - "%u bytes of pad data.\n", - (unsigned int)pad_len)); - goto err_exit; - } - } if (!data_blob_append(p->mem_ctx, &p->out_data.frag, auth_blob.data, auth_blob.length)) { |