summaryrefslogtreecommitdiff
path: root/package/samba/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-05-01 13:47:41 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2015-05-01 13:47:48 -0500
commita797fbeb4d82187d10df431c6e5a3dc0a33e5b35 (patch)
tree47438ff0f447b55c8fcd267286fad7ccec4d27f1 /package/samba/patches
parente553b50c7e7b74c8bf5457e625f0875134b38e68 (diff)
use embedded heimdal and bundled com_err
Diffstat (limited to 'package/samba/patches')
-rw-r--r--package/samba/patches/patch-wscript_build22
1 files changed, 22 insertions, 0 deletions
diff --git a/package/samba/patches/patch-wscript_build b/package/samba/patches/patch-wscript_build
new file mode 100644
index 000000000..ec7527dd8
--- /dev/null
+++ b/package/samba/patches/patch-wscript_build
@@ -0,0 +1,22 @@
+--- samba-4.2.1.orig/wscript_build 2014-12-20 09:07:55.000000000 -0600
++++ samba-4.2.1/wscript_build 2015-04-30 23:51:25.915427028 -0500
+@@ -123,18 +123,7 @@ bld.RECURSE('libcli/samsync')
+ bld.RECURSE('libcli/registry')
+ bld.RECURSE('source4/lib/policy')
+ bld.RECURSE('libcli/named_pipe_auth')
+-
+-if bld.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'):
+- if bld.CONFIG_GET("HEIMDAL_KRB5_CONFIG") and bld.CONFIG_GET("USING_SYSTEM_KRB5"):
+- # When both HEIMDAL_KRB5_CONFIG and KRB5_CONFIG are set and not equal,
+- # it means one is Heimdal-specific (krb5-config.heimdal, for example)
+- # and there is system heimdal
+- bld.PROCESS_SEPARATE_RULE('system_heimdal')
+- else:
+- bld.PROCESS_SEPARATE_RULE('embedded_heimdal')
+-else:
+- bld.PROCESS_SEPARATE_RULE('system_mitkrb5')
+-
++bld.PROCESS_SEPARATE_RULE('embedded_heimdal')
+ bld.RECURSE('libcli/smbreadline')
+ bld.RECURSE('codepages')
+ if bld.AD_DC_BUILD_IS_ENABLED():