Attachment 18516 Details for Bug 15769 – Patch for v4-21-test

[patch] Patch for v4-21-test

bfixes-tmp421.txt (text/plain), 1.99 KB, created by Stefan Metzmacher on 2024-12-19 09:14:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2024-12-19 09:14:16 UTC

Size: 1.99 KB

patch

obsolete

>From d25b7071b7a54cb867000a1f1f0ee86ce23100f5 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Mon, 16 Dec 2024 14:43:41 +0100
>Subject: [PATCH] s4:scripting: fix gen_hresult.py
>
>Commit 6877e4849e81ed8f7f355fa4069f13a134e999ce reversed the
>return values of hresult_errstr() and hresult_errstr_const().
>
>hresult_errstr() should return "HRES_SEC_E_WRONG_PRINCIPAL",
>while hresult_errstr_const() should return
>"The target principal name is incorrect.".
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15769
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Guenther Deschner <gd@samba.org>
>(cherry picked from commit 6e0e9c4efc86f5ec4566aa0220ed4a74ad5436c1)
>---
> source4/scripting/bin/gen_hresult.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source4/scripting/bin/gen_hresult.py b/source4/scripting/bin/gen_hresult.py
>index 3caca259436f..dec0adf11be1 100755
>--- a/source4/scripting/bin/gen_hresult.py
>+++ b/source4/scripting/bin/gen_hresult.py
>@@ -101,7 +101,7 @@ def generateSourceFile(out_file, errors):
>     out_file.write("	switch (HRES_ERROR_V(err_code)) {\n")
>     for err in errors:
>         out_file.write(f'            case 0x{err.err_code:X}:\n')
>-        out_file.write(f'                result = \"{err.err_define}\";\n')
>+        out_file.write(f'                result = \"{err.err_string}\";\n')
>         out_file.write(f'                break;\n')
>     out_file.write("	}\n")
>     out_file.write("\n")
>@@ -120,7 +120,7 @@ def generateSourceFile(out_file, errors):
>     out_file.write("	switch (HRES_ERROR_V(err_code)) {\n")
>     for err in errors:
>         out_file.write(f'            case 0x{err.err_code:X}:\n')
>-        out_file.write(f'                return \"{err.err_string}\";\n')
>+        out_file.write(f'                return \"{err.err_define}\";\n')
>         out_file.write(f'                break;\n')
>     out_file.write("	}\n")
>     out_file.write("	snprintf(msg, sizeof(msg), \"HRES code 0x%08x\", HRES_ERROR_V(err_code));\n")
>-- 
>2.34.1
>

Flags:

gd: review+

Actions: View

Attachments on bug 15769: 18516 | 18517