From d1934e2331f4e452dce8fa2ed2e32ea595dc5e97 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 12 Nov 2021 19:24:33 +0100 Subject: named_pipe_auth: Bump info4 to info5 We'll add a field soon Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- libcli/named_pipe_auth/npa_tstream.c | 108 +++++++++++++++++------------------ libcli/named_pipe_auth/npa_tstream.h | 4 +- 2 files changed, 56 insertions(+), 56 deletions(-) (limited to 'libcli/named_pipe_auth') diff --git a/libcli/named_pipe_auth/npa_tstream.c b/libcli/named_pipe_auth/npa_tstream.c index a6fa0211d20..7638d97f992 100644 --- a/libcli/named_pipe_auth/npa_tstream.c +++ b/libcli/named_pipe_auth/npa_tstream.c @@ -72,7 +72,7 @@ struct tevent_req *tstream_npa_connect_send(TALLOC_CTX *mem_ctx, int ret; enum ndr_err_code ndr_err; char *lower_case_npipe; - struct named_pipe_auth_req_info4 *info4; + struct named_pipe_auth_req_info5 *info5; req = tevent_req_create(mem_ctx, &state, struct tstream_npa_connect_state); @@ -118,36 +118,36 @@ struct tevent_req *tstream_npa_connect_send(TALLOC_CTX *mem_ctx, goto post; } - state->auth_req.level = 4; - info4 = &state->auth_req.info.info4; + state->auth_req.level = 5; + info5 = &state->auth_req.info.info5; - info4->remote_client_name = remote_client_name_in; - info4->remote_client_addr = tsocket_address_inet_addr_string(remote_client_addr, + info5->remote_client_name = remote_client_name_in; + info5->remote_client_addr = tsocket_address_inet_addr_string(remote_client_addr, state); - if (!info4->remote_client_addr) { + if (!info5->remote_client_addr) { /* errno might be EINVAL */ tevent_req_error(req, errno); goto post; } - info4->remote_client_port = tsocket_address_inet_port(remote_client_addr); - if (!info4->remote_client_name) { - info4->remote_client_name = info4->remote_client_addr; + info5->remote_client_port = tsocket_address_inet_port(remote_client_addr); + if (!info5->remote_client_name) { + info5->remote_client_name = info5->remote_client_addr; } - info4->local_server_name = local_server_name_in; - info4->local_server_addr = tsocket_address_inet_addr_string(local_server_addr, + info5->local_server_name = local_server_name_in; + info5->local_server_addr = tsocket_address_inet_addr_string(local_server_addr, state); - if (!info4->local_server_addr) { + if (!info5->local_server_addr) { /* errno might be EINVAL */ tevent_req_error(req, errno); goto post; } - info4->local_server_port = tsocket_address_inet_port(local_server_addr); - if (!info4->local_server_name) { - info4->local_server_name = info4->local_server_addr; + info5->local_server_port = tsocket_address_inet_port(local_server_addr); + if (!info5->local_server_name) { + info5->local_server_name = info5->local_server_addr; } - info4->session_info = discard_const_p(struct auth_session_info_transport, session_info); + info5->session_info = discard_const_p(struct auth_session_info_transport, session_info); if (DEBUGLVL(10)) { NDR_PRINT_DEBUG(named_pipe_auth_req, &state->auth_req); @@ -344,10 +344,10 @@ int _tstream_npa_connect_recv(struct tevent_req *req, npas->unix_stream = talloc_move(stream, &state->unix_stream); switch (state->auth_rep.level) { - case 4: - npas->file_type = state->auth_rep.info.info4.file_type; - device_state = state->auth_rep.info.info4.device_state; - allocation_size = state->auth_rep.info.info4.allocation_size; + case 5: + npas->file_type = state->auth_rep.info.info5.file_type; + device_state = state->auth_rep.info.info5.device_state; + allocation_size = state->auth_rep.info.info5.allocation_size; break; } @@ -1080,7 +1080,7 @@ static void tstream_npa_accept_existing_reply(struct tevent_req *subreq) tevent_req_data(req, struct tstream_npa_accept_state); struct named_pipe_auth_req *pipe_request; struct named_pipe_auth_rep pipe_reply; - struct named_pipe_auth_req_info4 i4; + struct named_pipe_auth_req_info5 i5; enum ndr_err_code ndr_err; DATA_BLOB in, out; int err; @@ -1143,52 +1143,52 @@ static void tstream_npa_accept_existing_reply(struct tevent_req *subreq) NDR_PRINT_DEBUG(named_pipe_auth_req, pipe_request); } - ZERO_STRUCT(i4); + ZERO_STRUCT(i5); - if (pipe_request->level != 4) { + if (pipe_request->level != 5) { DEBUG(0, ("Unknown level %u\n", pipe_request->level)); pipe_reply.level = 0; pipe_reply.status = NT_STATUS_INVALID_LEVEL; goto reply; } - pipe_reply.level = 4; + pipe_reply.level = 5; pipe_reply.status = NT_STATUS_OK; - pipe_reply.info.info4.file_type = state->file_type; - pipe_reply.info.info4.device_state = state->device_state; - pipe_reply.info.info4.allocation_size = state->alloc_size; + pipe_reply.info.info5.file_type = state->file_type; + pipe_reply.info.info5.device_state = state->device_state; + pipe_reply.info.info5.allocation_size = state->alloc_size; - i4 = pipe_request->info.info4; - if (i4.local_server_addr == NULL) { + i5 = pipe_request->info.info5; + if (i5.local_server_addr == NULL) { pipe_reply.status = NT_STATUS_INVALID_ADDRESS; DEBUG(2, ("Missing local server address\n")); goto reply; } - if (i4.remote_client_addr == NULL) { + if (i5.remote_client_addr == NULL) { pipe_reply.status = NT_STATUS_INVALID_ADDRESS; DEBUG(2, ("Missing remote client address\n")); goto reply; } ret = tsocket_address_inet_from_strings(state, "ip", - i4.local_server_addr, - i4.local_server_port, + i5.local_server_addr, + i5.local_server_port, &state->local_server_addr); if (ret != 0) { DEBUG(2, ("Invalid local server address[%s:%u] - %s\n", - i4.local_server_addr, i4.local_server_port, + i5.local_server_addr, i5.local_server_port, strerror(errno))); pipe_reply.status = NT_STATUS_INVALID_ADDRESS; goto reply; } ret = tsocket_address_inet_from_strings(state, "ip", - i4.remote_client_addr, - i4.remote_client_port, + i5.remote_client_addr, + i5.remote_client_port, &state->remote_client_addr); if (ret != 0) { DEBUG(2, ("Invalid remote client address[%s:%u] - %s\n", - i4.remote_client_addr, i4.remote_client_port, + i5.remote_client_addr, i5.remote_client_port, strerror(errno))); pipe_reply.status = NT_STATUS_INVALID_ADDRESS; goto reply; @@ -1245,14 +1245,14 @@ static void tstream_npa_accept_existing_done(struct tevent_req *subreq) tevent_req_done(req); } -static struct named_pipe_auth_req_info4 *copy_npa_info4( - TALLOC_CTX *mem_ctx, const struct named_pipe_auth_req_info4 *src) +static struct named_pipe_auth_req_info5 *copy_npa_info5( + TALLOC_CTX *mem_ctx, const struct named_pipe_auth_req_info5 *src) { - struct named_pipe_auth_req_info4 *dst = NULL; + struct named_pipe_auth_req_info5 *dst = NULL; DATA_BLOB blob; enum ndr_err_code ndr_err; - dst = talloc_zero(mem_ctx, struct named_pipe_auth_req_info4); + dst = talloc_zero(mem_ctx, struct named_pipe_auth_req_info5); if (dst == NULL) { return NULL; } @@ -1261,9 +1261,9 @@ static struct named_pipe_auth_req_info4 *copy_npa_info4( &blob, dst, src, - (ndr_push_flags_fn_t)ndr_push_named_pipe_auth_req_info4); + (ndr_push_flags_fn_t)ndr_push_named_pipe_auth_req_info5); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { - DBG_WARNING("ndr_push_named_pipe_auth_req_info4 failed: %s\n", + DBG_WARNING("ndr_push_named_pipe_auth_req_info5 failed: %s\n", ndr_errstr(ndr_err)); TALLOC_FREE(dst); return NULL; @@ -1273,10 +1273,10 @@ static struct named_pipe_auth_req_info4 *copy_npa_info4( &blob, dst, dst, - (ndr_pull_flags_fn_t)ndr_pull_named_pipe_auth_req_info4); + (ndr_pull_flags_fn_t)ndr_pull_named_pipe_auth_req_info5); TALLOC_FREE(blob.data); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { - DBG_WARNING("ndr_push_named_pipe_auth_req_info4 failed: %s\n", + DBG_WARNING("ndr_push_named_pipe_auth_req_info5 failed: %s\n", ndr_errstr(ndr_err)); TALLOC_FREE(dst); return NULL; @@ -1290,7 +1290,7 @@ int _tstream_npa_accept_existing_recv( int *perrno, TALLOC_CTX *mem_ctx, struct tstream_context **stream, - struct named_pipe_auth_req_info4 **info4, + struct named_pipe_auth_req_info5 **info5, struct tsocket_address **remote_client_addr, char **_remote_client_name, struct tsocket_address **local_server_addr, @@ -1300,7 +1300,7 @@ int _tstream_npa_accept_existing_recv( { struct tstream_npa_accept_state *state = tevent_req_data(req, struct tstream_npa_accept_state); - struct named_pipe_auth_req_info4 *i4 = &state->pipe_request->info.info4; + struct named_pipe_auth_req_info5 *i5 = &state->pipe_request->info.info5; struct tstream_npa *npas; int ret; @@ -1341,20 +1341,20 @@ int _tstream_npa_accept_existing_recv( npas->unix_stream = state->plain; npas->file_type = state->file_type; - if (info4 != NULL) { + if (info5 != NULL) { /* - * Make a full copy of "info4" because further down we + * Make a full copy of "info5" because further down we * talloc_move() away substructures from * state->pipe_request. */ - struct named_pipe_auth_req_info4 *dst = copy_npa_info4( - mem_ctx, i4); + struct named_pipe_auth_req_info5 *dst = copy_npa_info5( + mem_ctx, i5); if (dst == NULL) { *perrno = ENOMEM; tevent_req_received(req); return -1; } - *info4 = dst; + *info5 = dst; } if (remote_client_addr != NULL) { @@ -1363,7 +1363,7 @@ int _tstream_npa_accept_existing_recv( } if (_remote_client_name != NULL) { *_remote_client_name = discard_const_p( - char, talloc_move(mem_ctx, &i4->remote_client_name)); + char, talloc_move(mem_ctx, &i5->remote_client_name)); } if (local_server_addr != NULL) { *local_server_addr = talloc_move( @@ -1371,10 +1371,10 @@ int _tstream_npa_accept_existing_recv( } if (local_server_name != NULL) { *local_server_name = discard_const_p( - char, talloc_move(mem_ctx, &i4->local_server_name)); + char, talloc_move(mem_ctx, &i5->local_server_name)); } if (session_info != NULL) { - *session_info = talloc_move(mem_ctx, &i4->session_info); + *session_info = talloc_move(mem_ctx, &i5->session_info); } tevent_req_received(req); diff --git a/libcli/named_pipe_auth/npa_tstream.h b/libcli/named_pipe_auth/npa_tstream.h index 27e4d9c5a21..ce158fb12dd 100644 --- a/libcli/named_pipe_auth/npa_tstream.h +++ b/libcli/named_pipe_auth/npa_tstream.h @@ -24,7 +24,7 @@ struct tevent_req; struct tevent_context; struct auth_session_info_transport; struct tsocket_address; -struct named_pipe_auth_req_info4; +struct named_pipe_auth_req_info5; struct tevent_req *tstream_npa_connect_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, @@ -110,7 +110,7 @@ int _tstream_npa_accept_existing_recv( int *perrno, TALLOC_CTX *mem_ctx, struct tstream_context **stream, - struct named_pipe_auth_req_info4 **info4, + struct named_pipe_auth_req_info5 **info5, struct tsocket_address **remote_client_addr, char **_remote_client_name, struct tsocket_address **local_server_addr, -- cgit v1.2.1