From b5af90bd5c687e32e48495fadf128c7f15f44bfd Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 29 Oct 2024 08:55:13 +0100 Subject: [PATCH] torture4: Simplifiy [tcp|udp]_ldap_netlogon() Both callers set "map_response=true", so we don't need that flag here. Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- source4/torture/ldap/netlogon.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/source4/torture/ldap/netlogon.c b/source4/torture/ldap/netlogon.c index 0bddb3e3613..564e1871271 100644 --- a/source4/torture/ldap/netlogon.c +++ b/source4/torture/ldap/netlogon.c @@ -68,7 +68,6 @@ static bool test_ldap_netlogon(struct torture_context *tctx, search.in.dest_port = 0; search.in.acct_control = -1; search.in.version = NETLOGON_NT_VERSION_5 | NETLOGON_NT_VERSION_5EX; - search.in.map_response = true; empty_search = search; @@ -308,7 +307,6 @@ static bool test_ldap_netlogon_flags(struct torture_context *tctx, search.in.dest_port = 0; search.in.acct_control = -1; search.in.version = NETLOGON_NT_VERSION_5 | NETLOGON_NT_VERSION_5EX; - search.in.map_response = true; status = request_netlogon(cldap, tctx, &search); CHECK_STATUS(status, NT_STATUS_OK); @@ -465,9 +463,7 @@ static NTSTATUS tcp_ldap_netlogon(void *conn, return status; } - if (io->in.map_response) { - map_netlogon_samlogon_response(&io->out.netlogon); - } + map_netlogon_samlogon_response(&io->out.netlogon); return NT_STATUS_OK; } @@ -626,8 +622,11 @@ static NTSTATUS udp_ldap_netlogon(void *data, { struct cldap_socket *cldap = talloc_get_type(data, struct cldap_socket); - - return cldap_netlogon(cldap, mem_ctx, io); + NTSTATUS status = cldap_netlogon(cldap, mem_ctx, io); + if (NT_STATUS_IS_OK(status)) { + map_netlogon_samlogon_response(&io->out.netlogon); + } + return status; } bool torture_netlogon_udp(struct torture_context *tctx) -- 2.47.3