diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-12-06 17:44:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:06:24 -0500 |
| commit | 37e2570632cd26dc087772254ccd1270b8f82610 (patch) | |
| tree | 33d5038e5b8b3eb92bfcec92dc6566c546003239 | |
| parent | 82da9a75d8b3976c79384e89ab248c235fc885e0 (diff) | |
| download | samba-37e2570632cd26dc087772254ccd1270b8f82610.tar.gz samba-37e2570632cd26dc087772254ccd1270b8f82610.tar.bz2 samba-37e2570632cd26dc087772254ccd1270b8f82610.zip | |
r4081: use clearer names
metze
(This used to be commit 5d7d6f02cf1aa731d371c97054480d83d85102cb)
| -rw-r--r-- | source4/librpc/idl/dcerpc.idl | 2 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc.c | 4 | ||||
| -rw-r--r-- | source4/rpc_server/dcesrv_auth.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/librpc/idl/dcerpc.idl b/source4/librpc/idl/dcerpc.idl index 1b8add3e79..6476911904 100644 --- a/source4/librpc/idl/dcerpc.idl +++ b/source4/librpc/idl/dcerpc.idl @@ -175,7 +175,7 @@ interface dcerpc [case(DCERPC_PKT_ALTER)] dcerpc_bind alter; [case(DCERPC_PKT_ALTER_ACK)] dcerpc_bind_ack alter_ack; [case(DCERPC_PKT_FAULT)] dcerpc_fault fault; - [case(DCERPC_PKT_AUTH3)] dcerpc_auth3 auth; + [case(DCERPC_PKT_AUTH3)] dcerpc_auth3 auth3; [case(DCERPC_PKT_BIND_NAK)] dcerpc_bind_nak bind_nak; } dcerpc_payload; diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 7cd18d2807..2ff3d23335 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -681,8 +681,8 @@ NTSTATUS dcerpc_auth3(struct dcerpc_pipe *p, pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST; pkt.call_id = next_call_id(p); pkt.auth_length = 0; - pkt.u.auth._pad = 0; - pkt.u.auth.auth_info = data_blob(NULL, 0); + pkt.u.auth3._pad = 0; + pkt.u.auth3.auth_info = data_blob(NULL, 0); /* construct the NDR form of the packet */ status = dcerpc_push_auth(&blob, mem_ctx, &pkt, p->security_state.auth_info); diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c index a753a7d519..f546e8d6e1 100644 --- a/source4/rpc_server/dcesrv_auth.c +++ b/source4/rpc_server/dcesrv_auth.c @@ -157,11 +157,11 @@ BOOL dcesrv_auth_auth3(struct dcesrv_call_state *call) /* We can't work without an existing gensec state, and an new blob to feed it */ if (!dce_conn->auth_state.auth_info || !dce_conn->auth_state.gensec_security || - pkt->u.auth.auth_info.length == 0) { + pkt->u.auth3.auth_info.length == 0) { return False; } - status = ndr_pull_struct_blob(&pkt->u.auth.auth_info, + status = ndr_pull_struct_blob(&pkt->u.auth3.auth_info, call, dce_conn->auth_state.auth_info, (ndr_pull_flags_fn_t)ndr_pull_dcerpc_auth); |