nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

samba: apply patch mailinglist, which fixes #ifdef boundaries

Browse Source 
http://samba.2283325.n4.nabble.com/Fix-compilation-of-Samba-4-7-4-with-disabled-ADS-td4728041.html
This commit is contained in:
Lengyel Balazs 2018-01-18 22:55:43 +01:00
parent bc474e2dd8
commit 49aa5804ed
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/servers/samba/4.x.nix
View File

@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
patches =
[ ./4.x-no-persistent-install.patch
./patch-source3__libads__kerberos_keytab.c.patch
];
buildInputs =

20
pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch Normal file
View File

@ -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
***********************************************************************/