HEIMDAL: move code from source4/heimdal* to third_party/heimdal*

This makes it clearer that we always want to do heimdal changes
via the lorikeet-heimdal repository.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>

Autobuild-User(master): Joseph Sutton <jsutton@samba.org>
Autobuild-Date(master): Wed Jan 19 21:41:59 UTC 2022 on sn-devel-184

.editorconfig

@@ -27,7 +27,7 @@ indent_style = space
 indent_size = 4
 tab_width = 4
 
-[source4/heimdal/**.{c,h}]
+[third_party/heimdal/**.{c,h}]
 indent_style = space
 indent_size = 4
 tab_width = 8

buildtools/wafsamba/samba3.py

@@ -37,12 +37,12 @@ def s3_fix_kwargs(bld, kwargs):
     extra_includes = [ '.', 'include', 'lib' ]
     # local heimdal paths must only be included when using our embedded Heimdal
     if bld.CONFIG_SET("USING_EMBEDDED_HEIMDAL"):
-        extra_includes += [ '../source4/heimdal/lib/com_err',
+        extra_includes += [ '../third_party/heimdal/lib/com_err',
-                            '../source4/heimdal/lib/base',
+                            '../third_party/heimdal/lib/base',
-                            '../source4/heimdal/lib/krb5',
+                            '../third_party/heimdal/lib/krb5',
-                            '../source4/heimdal/lib/gssapi/gssapi',
+                            '../third_party/heimdal/lib/gssapi/gssapi',
-                            '../source4/heimdal_build/include',
+                            '../third_party/heimdal_build/include',
-                            '../bin/default/source4/heimdal/lib/asn1' ]
+                            '../bin/default/third_party/heimdal/lib/asn1' ]
 
     if bld.CONFIG_SET('USING_SYSTEM_TDB'):
         (tdb_includes, tdb_ldflags, tdb_cpppath) = library_flags(bld, 'tdb')

python/samba/tests/source_chars.py

@@ -66,10 +66,10 @@ IGNORED_FILES = (
 )
 
 IGNORED_RE = (
-    r'^source4/heimdal/lib/hcrypto/passwd_dialog',
+    r'^third_party/heimdal/lib/hcrypto/passwd_dialog',
-    r'^source4/heimdal/lib/hx509/data/',
+    r'^third_party/heimdal/lib/hx509/data/',
-    r'^source4/heimdal/po',
+    r'^third_party/heimdal/po',
-    r'^source4/heimdal/tests/kdc/hdb-mitdb',
+    r'^third_party/heimdal/tests/kdc/hdb-mitdb',
 )
 
 IGNORED_EXTENSIONS = {
@@ -110,7 +110,7 @@ SAFE_FORMAT_CHARS = {
 # In the real world mixing directions would be normal in bilingual
 # documents, but it is rare in Samba source code.
 BIDI_FILES = {
-    'source4/heimdal/lib/wind/NormalizationTest.txt',
+    'third_party/heimdal/lib/wind/NormalizationTest.txt',
     'testdata/source-chars-bidi.py',
 }
 
@@ -164,8 +164,8 @@ def is_latin1_file(name):
     for pattern in (
             r'^source4/setup/ad-schema/\w+.ldf$',
             r'^source4/setup/display-specifiers/D[\w-]+.txt$',
-            r'^source4/heimdal/cf/pkg.m4$',
+            r'^third_party/heimdal/cf/pkg.m4$',
-            r'^source4/heimdal/doc/standardisation/',
+            r'^third_party/heimdal/doc/standardisation/',
     ):
         if re.match(pattern, name):
             return True

selftest/ubsan.supp

@@ -1,6 +1,6 @@
 # Suppress the
 # "left shift of x by y places cannot be represented in type 'int'"
 # in the heimdal code for now.
-shift-base:../../source4/heimdal/lib/hcrypto/des.c
+shift-base:../../third_party/heimdal/lib/hcrypto/des.c
-shift-base:../../source4/heimdal/lib/krb5/crypto.c
+shift-base:../../third_party/heimdal/lib/krb5/crypto.c
 

source4/kdc/wscript_build

@@ -2,7 +2,7 @@
 
 # We do this because we do not want to depend on the KDC, only find and use it's header files.  We do not want 
 if not bld.CONFIG_SET("USING_SYSTEM_KDC"):
-    kdc_include = "../heimdal/kdc ../heimdal/lib/gssapi"
+    kdc_include = "../../third_party/heimdal/kdc ../../third_party/heimdal/lib/gssapi"
 else:
     kdc_include = getattr(bld.env, "CPPPATH_KDC")