diff options
| author | Lengyel Balazs <ikervagyok@gmail.com> | 2018-01-18 22:55:43 +0100 |
|---|---|---|
| committer | Lengyel Balazs <ikervagyok@gmail.com> | 2018-01-18 23:49:31 +0100 |
| commit | 49aa5804ed2615101ee4a078fbd05ca1e646098f (patch) | |
| tree | 379d2789abdefb00d6078bbcca2bbca0cbcb79cc /pkgs/servers/samba | |
| parent | bc474e2dd847776193678ef83143c92da4925d95 (diff) | |
| download | nixpkgs-49aa5804ed2615101ee4a078fbd05ca1e646098f.tar nixpkgs-49aa5804ed2615101ee4a078fbd05ca1e646098f.tar.gz nixpkgs-49aa5804ed2615101ee4a078fbd05ca1e646098f.tar.bz2 nixpkgs-49aa5804ed2615101ee4a078fbd05ca1e646098f.tar.lz nixpkgs-49aa5804ed2615101ee4a078fbd05ca1e646098f.tar.xz nixpkgs-49aa5804ed2615101ee4a078fbd05ca1e646098f.tar.zst nixpkgs-49aa5804ed2615101ee4a078fbd05ca1e646098f.zip | |
samba: apply patch mailinglist, which fixes `#ifdef` boundaries
http://samba.2283325.n4.nabble.com/Fix-compilation-of-Samba-4-7-4-with-disabled-ADS-td4728041.html
Diffstat (limited to 'pkgs/servers/samba')
| -rw-r--r-- | pkgs/servers/samba/4.x.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index a0fecc18365..fa910e80dab 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { patches = [ ./4.x-no-persistent-install.patch + ./patch-source3__libads__kerberos_keytab.c.patch ]; buildInputs = diff --git a/pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch b/pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch new file mode 100644 index 00000000000..9f6577c65c1 --- /dev/null +++ b/pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch @@ -0,0 +1,20 @@ +--- old/source3/libads/kerberos_keytab.c 2017-12-23 14:23:53.247467000 +0100 ++++ new/source3/libads/kerberos_keytab.c 2017-12-23 18:57:07.135340000 +0100 +@@ -32,8 +32,6 @@ + + #ifdef HAVE_KRB5 + +-#ifdef HAVE_ADS +- + /* This MAX_NAME_LEN is a constant defined in krb5.h */ + #ifndef MAX_KEYTAB_NAME_LEN + #define MAX_KEYTAB_NAME_LEN 1100 +@@ -85,6 +83,8 @@ + return ret; + } + ++#ifdef HAVE_ADS ++ + /********************************************************************** + Adds a single service principal, i.e. 'host' to the system keytab + ***********************************************************************/ |