pyrox.dev / nixpkgs
lol
fork atom

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

Lengyel Balazs 49aa5804 bc474e2d

+21
unified split
+1
pkgs/servers/samba/4.x.nix
··· 30 30 31 31 patches = 32 32 [ ./4.x-no-persistent-install.patch 33 + ./patch-source3__libads__kerberos_keytab.c.patch 33 34 ]; 34 35 35 36 buildInputs =
+20
pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch
··· 1 + --- old/source3/libads/kerberos_keytab.c 2017-12-23 14:23:53.247467000 +0100 2 + +++ new/source3/libads/kerberos_keytab.c 2017-12-23 18:57:07.135340000 +0100 3 + @@ -32,8 +32,6 @@ 4 + 5 + #ifdef HAVE_KRB5 6 + 7 + -#ifdef HAVE_ADS 8 + - 9 + /* This MAX_NAME_LEN is a constant defined in krb5.h */ 10 + #ifndef MAX_KEYTAB_NAME_LEN 11 + #define MAX_KEYTAB_NAME_LEN 1100 12 + @@ -85,6 +83,8 @@ 13 + return ret; 14 + } 15 + 16 + +#ifdef HAVE_ADS 17 + + 18 + /********************************************************************** 19 + Adds a single service principal, i.e. 'host' to the system keytab 20 + ***********************************************************************/