[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  29558014911 torture3: Correct use of enum client_flavour defines
       via  f38ed3554db librpc: Fix the build on FreeBSD
       via  89897359776 librpc: Fix #define header guard
      from  b8ffb245964 third_party/heimdal: krb5: Try to decode e-data as KERB-ERROR-DATA (falling back to METHOD-DATA) (Import lorikeet-heimdal-202311092338 (commit 50996e5f0b0f22a4eb755a6f22cb7b4ecab2aeea))

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2955801491113200d7c5892839b9f0b47aabb300
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 9 16:23:49 2023 +0100

    torture3: Correct use of enum client_flavour defines
    
    enum client_flavour does not define LINUX, it defines WINDOWS and
    POSIX.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri Nov 10 02:33:33 UTC 2023 on atb-devel-224

commit f38ed3554db031d7e831baa485b1b07230f21121
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 9 16:18:13 2023 +0100

    librpc: Fix the build on FreeBSD
    
    ndr_wsp.h included standalone does not find struct timespec on FreeBSD
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 89897359776a5b7cb19d262a359516584a7d1764
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 9 16:17:50 2023 +0100

    librpc: Fix #define header guard
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 librpc/wsp/wsp_util.h                  | 2 +-
 source3/torture/test_posix.c           | 8 ++++----
 source4/scripting/bin/gen_wsp_props.py | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/wsp/wsp_util.h b/librpc/wsp/wsp_util.h
index 0f64da2e550..ccda53b88cc 100644
--- a/librpc/wsp/wsp_util.h
+++ b/librpc/wsp/wsp_util.h
@@ -19,7 +19,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef __LIBRPC_WSP_UTIL_H__
-#define __LIBRPC_WSP_UTIL__H__
+#define __LIBRPC_WSP_UTIL_H__
 
 #include "librpc/gen_ndr/misc.h"
 
diff --git a/source3/torture/test_posix.c b/source3/torture/test_posix.c
index ac4c1a1cb34..ca403360153 100644
--- a/source3/torture/test_posix.c
+++ b/source3/torture/test_posix.c
@@ -254,7 +254,7 @@ bool run_posix_ls_wildcard_test(int dummy)
 	posix_test_entries_reset(state);
 
 	printf("Doing POSIX ls *\n");
-	state->flavour = LINUX;
+	state->flavour = POSIX;
 
 	status = cli_list(cli_unix, "*", 0, posix_ls_fn, state);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -470,7 +470,7 @@ bool run_posix_ls_single_test(int dummy)
 	posix_test_entries_reset(state);
 
 	printf("Doing POSIX ls single\n");
-	state->flavour = LINUX;
+	state->flavour = POSIX;
 
 	cli_list(cli_unix, file, 0, posix_ls_fn, state);
 	cli_list(cli_unix, symlnk_dangling, 0, posix_ls_fn, state);
@@ -564,7 +564,7 @@ bool run_posix_readlink_test(int dummy)
 	frame = talloc_stackframe();
 
 	printf("Starting POSIX-READLINK test\n");
-	state->flavour = LINUX;
+	state->flavour = POSIX;
 
 	if (!torture_open_connection(&cli_unix, 0)) {
 		TALLOC_FREE(frame);
@@ -716,7 +716,7 @@ bool run_posix_stat_test(int dummy)
 	frame = talloc_stackframe();
 
 	printf("Starting POSIX-STAT test\n");
-	state->flavour = LINUX;
+	state->flavour = POSIX;
 
 	if (!torture_open_connection(&cli_unix, 0)) {
 		TALLOC_FREE(frame);
diff --git a/source4/scripting/bin/gen_wsp_props.py b/source4/scripting/bin/gen_wsp_props.py
index 46913846856..e33169ee50d 100755
--- a/source4/scripting/bin/gen_wsp_props.py
+++ b/source4/scripting/bin/gen_wsp_props.py
@@ -136,7 +136,8 @@ def getVtype(prop):
 	return result
 
 def generateSourceCode(propMap, outputFile):
-	source = "#include \"bin/default/librpc/gen_ndr/ndr_wsp.h\"\n"
+	source = "#include \"replace.h\"\n"
+	source = source + "#include \"bin/default/librpc/gen_ndr/ndr_wsp.h\"\n"
 	source = source + "#include \"librpc/wsp/wsp_util.h\"\n"
 	count = 0
 	for guid in propMap.keys():


-- 
Samba Shared Repository