3 files changed, 33 insertions, 6 deletions
diff --git a/source4/heimdal_build/replace.c b/source4/heimdal_build/replace.c
index 51393f6e68..e6a74f9ba8 100644
--- a/source4/heimdal_build/replace.c
+++ b/source4/heimdal_build/replace.c
@@ -83,3 +83,20 @@
 	return -1;
 }
 #endif
+
+#ifndef HAVE_SETPROGNAME
+
+/* We don't want to use a setprogname reimplementation */
+void setprogname(const char *argv0)
+{
+}
+
+#endif /* HAVE_SETPROGNAME */
+
+#ifndef HAVE_GETPROGNAME
+/* We don't want to use a getprogname reimplementation */
+const char *getprogname(void)
+{
+	return "";
+}
+#endif /* HAVE_GETPROGNAME */
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index a1bd4783b0..705caa52e2 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -400,12 +400,6 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
         ../heimdal_build/replace.c
     '''
 
-    if not bld.CONFIG_SET('HAVE_GETPROGNAME'):
-        ROKEN_HOSTCC_SOURCE += '''
-            lib/roken/getprogname.c
-            lib/roken/setprogname.c
-        '''
-
     if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
         ROKEN_HOSTCC_SOURCE += '''
             lib/roken/closefrom.c
@@ -621,6 +615,13 @@ if not bld.CONFIG_SET("USING_SYSTEM_KRB5"):
                                    version.c warn.c krb5_err.c
                                    heim_err.c k524_err.c krb_err.c''')]  + ["../heimdal_build/krb5-glue.c"]
 
+    # Alias subsystem to allow common kerberos code that will
+    # otherwise link against MIT's gssapi_krb5
+    HEIMDAL_SUBSYSTEM('gssapi_krb5',
+        '',
+        deps='gssapi'
+        )
+
     HEIMDAL_LIBRARY('krb5', KRB5_SOURCE,
         version_script='lib/krb5/version-script.map',
                         includes='../heimdal/lib/krb5 ../heimdal/lib/asn1 ../heimdal/include',
@@ -633,6 +634,12 @@ if not bld.CONFIG_SET("USING_SYSTEM_KRB5"):
     HEIMDAL_AUTOPROTO('lib/krb5/krb5-protos.h', KRB5_PROTO_SOURCE,
         options='-E KRB5_LIB -q -P comment -o')
 
+    # Alias subsystem to allow common kerberos code that will
+    # otherwise link against MIT's k5crypto
+    HEIMDAL_SUBSYSTEM('k5crypto',
+                      '',
+                      deps='krb5')
+
 if not bld.CONFIG_SET("USING_SYSTEM_ASN1"):
     HEIMDAL_HEIM_ASN1_DER_SOURCE = '''
         lib/asn1/der_get.c
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index f711fe7f28..6552d3a925 100644
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -73,6 +73,7 @@ conf.DEFINE('SAMBA4_INTERNAL_HEIMDAL', 1)
 # setup the right defines for a in-tree heimdal build
 Logs.info("Using in-tree heimdal kerberos defines")
 conf.define('HAVE_GSSAPI_GSSAPI_H', 1)
+conf.define('HAVE_GSSAPI_GSSAPI_KRB5_H', 1)
 conf.define('HAVE_AP_OPTS_USE_SUBKEY', 1)
 conf.define('HAVE_KRB5_ADDRESSES', 1)
 conf.define('HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK', 1)
@@ -82,6 +83,8 @@ conf.define('HAVE_ADDR_TYPE_IN_KRB5_ADDRESS', 1)
 conf.define('HAVE_GSS_DISPLAY_STATUS', 1)
 conf.define('HAVE_GSS_WRAP_IOV', 1)
 conf.define('HAVE_GSS_KRB5_IMPORT_CRED', 1)
+conf.define('HAVE_GSS_OID_EQUAL', 1)
+conf.define('HAVE_GSS_INQUIRE_SEC_CONTEXT_BY_OID', 1)
 conf.define('HAVE_GSSKRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT', 1)
 conf.define('HAVE_LIBGSSAPI', 1)
 conf.define('HAVE_ADDR_TYPE_IN_KRB5_ADDRESS', 1)