From 2c9a4ef86e5fa68091fc392740e7b04af759b698 Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Thu, 28 Apr 2022 20:33:07 +1200 Subject: [PATCH] libcli:util: Update werror table Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett Reviewed-by: Andreas Schneider --- libcli/util/werror.h | 1 - libcli/util/werror_err_table.txt | 20 +++++++++++++++++--- python/samba/drs_utils.py | 5 +---- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/libcli/util/werror.h b/libcli/util/werror.h index 0370a0618c1..d3d3327aef9 100644 --- a/libcli/util/werror.h +++ b/libcli/util/werror.h @@ -100,7 +100,6 @@ typedef uint32_t WERROR; #define WERR_INVALID_PRIMARY_GROUP W_ERROR(0x0000051C) #define WERR_DS_DRA_SECRETS_DENIED W_ERROR(0x000021B6) -#define WERR_DS_DRA_RECYCLED_TARGET W_ERROR(0x000021BF) #define WERR_DNS_ERROR_KEYMASTER_REQUIRED W_ERROR(0x0000238D) #define WERR_DNS_ERROR_NOT_ALLOWED_ON_SIGNED_ZONE W_ERROR(0x0000238E) diff --git a/libcli/util/werror_err_table.txt b/libcli/util/werror_err_table.txt index 75e8020f36e..5796afcb6c1 100644 --- a/libcli/util/werror_err_table.txt +++ b/libcli/util/werror_err_table.txt @@ -1762,7 +1762,7 @@ The Netlogon service cannot start because another Netlogon service running in th ERROR_SYNCHRONIZATION_REQUIRED -The Security Accounts Manager (SAM) database on a Windows Server operating system is significantly out of synchronization with the copy on the domain controller. A complete synchronization is required. +On applicable Windows Server releases, the Security Accounts Manager (SAM) database is significantly out of synchronization with the copy on the domain controller. A complete synchronization is required. 0x0000023A @@ -1846,7 +1846,7 @@ An event pair synchronization operation was performed using the thread-specific ERROR_DOMAIN_CTRLR_CONFIG_ERROR -A Windows Server has an incorrect configuration. +A domain server has an incorrect configuration. 0x00000246 @@ -8111,7 +8111,7 @@ The logon processor did not add the message alias. NERR_UnableToDelName_W -@W The logoff processor did not delete the message alias. +The logoff processor did not delete the message alias. 0x0000089F @@ -9925,6 +9925,13 @@ ERROR_PRINTER_DRIVER_DOWNLOAD_NEEDED The specified printer driver was not found on the system and needs to be downloaded. +0x00000BCE + +ERROR_PRINTER_NOT_SHAREABLE + + +The specified printer cannot be shared. + 0x00000F6E ERROR_IO_REISSUE_AS_CACHED @@ -15623,6 +15630,13 @@ ERROR_DS_INVALID_SEARCH_FLAG_TUPLE The search flags for the attribute are invalid. The tuple index bit is valid only on attributes of Unicode strings. +0x000021BF + +ERROR_DS_DRA_RECYCLED_TARGET + + +The replication operation failed because the target object referenced by a link value is recycled. + 0x000021C2 ERROR_DS_HIGH_DSA_VERSION diff --git a/python/samba/drs_utils.py b/python/samba/drs_utils.py index feab89b0d8e..a71da6eedd3 100644 --- a/python/samba/drs_utils.py +++ b/python/samba/drs_utils.py @@ -200,10 +200,7 @@ class drs_Replicate(object): # (if we support it and haven't already tried that) supports_ext = self.supports_ext - # TODO fix up the below line when we next update werror_err_table.txt - # and pull in the new error-code - # return (error_code == werror.WERR_DS_DRA_RECYCLED_TARGET and - return (error_code == 0x21bf and + return (error_code == werror.WERR_DS_DRA_RECYCLED_TARGET and supports_ext & DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V10 and (req.more_flags & drsuapi.DRSUAPI_DRS_GET_TGT) == 0) -- 2.11.4.GIT