From 52b94f3f0f8e26f2398d77565494b00c7c78d4f3 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 29 Oct 2024 17:33:39 +0100 Subject: [PATCH] Revert "libcli/auth: let netlogon_creds_cli_store_internal check netlogon_creds_CredentialState_legacy" This reverts commit c3fa132fbe179bd4e1451240ce572ec791356a16. We break the compat of the netlogon_creds_cli.tdb records compared to 4.21 with the next commits. Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider --- libcli/auth/netlogon_creds_cli.c | 13 ------------- librpc/idl/schannel.idl | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/libcli/auth/netlogon_creds_cli.c b/libcli/auth/netlogon_creds_cli.c index 1750ea3703c..256ab009012 100644 --- a/libcli/auth/netlogon_creds_cli.c +++ b/libcli/auth/netlogon_creds_cli.c @@ -756,7 +756,6 @@ static NTSTATUS netlogon_creds_cli_store_internal( enum ndr_err_code ndr_err; DATA_BLOB blob; TDB_DATA data; - struct netlogon_creds_CredentialState_legacy lc = { .sequence = 0, }; if (DEBUGLEVEL >= 10) { NDR_PRINT_DEBUG(netlogon_creds_CredentialState, creds); @@ -770,18 +769,6 @@ static NTSTATUS netlogon_creds_cli_store_internal( return status; } - ndr_err = ndr_pull_struct_blob_all(&blob, frame, &lc, - (ndr_pull_flags_fn_t)ndr_pull_netlogon_creds_CredentialState_legacy); - if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { - status = ndr_map_error2ntstatus(ndr_err); - TALLOC_FREE(frame); - return status; - } - - if (DEBUGLEVEL >= 11) { - NDR_PRINT_DEBUG(netlogon_creds_CredentialState_legacy, &lc); - } - data.dptr = blob.data; data.dsize = blob.length; diff --git a/librpc/idl/schannel.idl b/librpc/idl/schannel.idl index 9fe4b7aed7c..8905d514f55 100644 --- a/librpc/idl/schannel.idl +++ b/librpc/idl/schannel.idl @@ -85,19 +85,6 @@ interface schannel netlogon_creds_CredentialState_extra_info *ex; } netlogon_creds_CredentialState; - typedef [public,flag(NDR_PAHEX)] struct { - netr_NegotiateFlags negotiate_flags; - uint8 session_key[16]; - uint32 sequence; - netr_Credential seed; - netr_Credential client; - netr_Credential server; - netr_SchannelType secure_channel_type; - [string,charset(UTF8)] uint8 computer_name[]; - [string,charset(UTF8)] uint8 account_name[]; - dom_sid *sid; - } netlogon_creds_CredentialState_legacy; - /* This is used in the schannel_store.tdb */ typedef [public] struct { [string,charset(UTF16)] uint16 *computer_name; -- 2.47.3