diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-07-21 18:53:55 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-07-21 18:54:08 +0200 |
| commit | 04356dc250dbd642dbebdc800da39566caff8644 (patch) | |
| tree | f3e95dbca5f5344a0b210c532e9c64bb42462f18 /pkgs/servers/samba | |
| parent | f8f0c7196e4494d31d8be29af67a014d7ecb86fb (diff) | |
| download | nixpkgs-04356dc250dbd642dbebdc800da39566caff8644.tar nixpkgs-04356dc250dbd642dbebdc800da39566caff8644.tar.gz nixpkgs-04356dc250dbd642dbebdc800da39566caff8644.tar.bz2 nixpkgs-04356dc250dbd642dbebdc800da39566caff8644.tar.lz nixpkgs-04356dc250dbd642dbebdc800da39566caff8644.tar.xz nixpkgs-04356dc250dbd642dbebdc800da39566caff8644.tar.zst nixpkgs-04356dc250dbd642dbebdc800da39566caff8644.zip | |
samba: drop heimdal compat patch to fix the build (ZHF)
Diffstat (limited to 'pkgs/servers/samba')
| -rw-r--r-- | pkgs/servers/samba/4.x-heimdal-compat.patch | 16 | ||||
| -rw-r--r-- | pkgs/servers/samba/4.x.nix | 2 |
2 files changed, 1 insertions, 17 deletions
diff --git a/pkgs/servers/samba/4.x-heimdal-compat.patch b/pkgs/servers/samba/4.x-heimdal-compat.patch deleted file mode 100644 index 35f01e4001e..00000000000 --- a/pkgs/servers/samba/4.x-heimdal-compat.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c -index bb476e1..0a407a4 100644 ---- a/source4/kdc/kdc.c -+++ b/source4/kdc/kdc.c -@@ -967,9 +967,9 @@ static void kdc_task_init(struct task_server *task) - * The old behavior in the _kdc_get_preferred_key() - * function is use_strongest_server_key=TRUE. - */ -- kdc->config->as_use_strongest_session_key = false; -+ kdc->config->tgt_use_strongest_session_key = false; -+ kdc->config->svc_use_strongest_session_key = false; - kdc->config->preauth_use_strongest_session_key = false; -- kdc->config->tgs_use_strongest_session_key = false; - kdc->config->use_strongest_server_key = true; - - /* Register hdb-samba4 hooks for use as a keytab */ diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 1cdf7ad2ed0..6b8347177a0 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { patches = [ ./4.x-no-persistent-install.patch ./4.x-fix-ctdb-deps.patch - ] ++ stdenv.lib.optional enableKerberos ./4.x-heimdal-compat.patch; + ]; buildInputs = [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* |