From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 6 Dec 2021 22:30:10 +0000 (+1300)
Subject: heimdal_build: Do not build samba4kinit unless building embedded Heimdal
X-Git-Tag: tdb-1.4.6~436
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc2222eee8f62ace1b7a67401d502d2b3c4a1e17;p=thirdparty%2Fsamba.git

heimdal_build: Do not build samba4kinit unless building embedded Heimdal

We should not attempt to build local copies of Heimdal utilities against
a system krb5 library.

Inspired by a WIP commit by Stefan Metzmacher <metze@samba.org> in his
lorikeet-heimdal import branch of patches to upgrade to a modern Heimdal.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14924

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>
---

diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 77519356575..04628e5d7ae 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -901,23 +901,24 @@ if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'):
         )
     bld.env['COMPILE_ET'] = os.path.join(bld.bldnode.parent.abspath(), 'compile_et')
 
-HEIMDAL_BINARY('samba4kinit',
-    'kuser/kinit.c',
-    deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto',
-    install=False
-    )
+if bld.CONFIG_SET('USING_EMBEDDED_HEIMDAL'):
+    HEIMDAL_BINARY('samba4kinit',
+        'kuser/kinit.c',
+        deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto',
+        install=False
+        )
 
-HEIMDAL_BINARY('samba4kgetcred',
-    'kuser/kgetcred.c',
-    deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto asn1',
-    install=False
-    )
+    HEIMDAL_BINARY('samba4kgetcred',
+        'kuser/kgetcred.c',
+        deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto asn1',
+        install=False
+        )
 
-HEIMDAL_BINARY('samba4kpasswd',
-    'kpasswd/kpasswd.c',
-    deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto',
-    install=False
-    )
+    HEIMDAL_BINARY('samba4kpasswd',
+        'kpasswd/kpasswd.c',
+        deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto',
+        install=False
+        )
 
 # Alias subsystem to allow common kerberos code that will
 # otherwise link against MIT's gssapi_krb5 and k5crypto