movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #85362 from helsinki-systems/fix-samba-kerberos

Browse source 
samba: Switch back to builtin Heimdal Kerberos
This commit is contained in:
Florian Klink 2020-07-23 14:33:06 +02:00 • committed by GitHub
commit b4784dbb34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkgs/servers/samba/4.x.nix
View file

@ -31,7 +31,6 @@
, enableProfiling ? true , enableProfiling ? true
, enableMDNS ? false, avahi , enableMDNS ? false, avahi
, enableDomainController ? false, gpgme, lmdb , enableDomainController ? false, gpgme, lmdb
, enableKerberos ? true, krb5Full
, enableRegedit ? true, ncurses , enableRegedit ? true, ncurses
, enableCephFS ? false, libceph , enableCephFS ? false, libceph
, enableGlusterFS ? false, glusterfs, libuuid , enableGlusterFS ? false, glusterfs, libuuid
@ -92,7 +91,6 @@ stdenv.mkDerivation rec {
++ optional (enablePrinting && stdenv.isLinux) cups ++ optional (enablePrinting && stdenv.isLinux) cups
++ optional enableMDNS avahi ++ optional enableMDNS avahi
++ optionals enableDomainController [ gpgme lmdb ] ++ optionals enableDomainController [ gpgme lmdb ]
++ optional enableKerberos krb5Full
++ optional enableRegedit ncurses ++ optional enableRegedit ncurses
++ optional (enableCephFS && stdenv.isLinux) libceph ++ optional (enableCephFS && stdenv.isLinux) libceph
++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ] ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ]
@ -116,13 +114,9 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--disable-rpath" "--disable-rpath"
] ++ singleton (if enableDomainController ] ++ optional (!enableDomainController)
then "--with-experimental-mit-ad-dc" "--without-ad-dc"
else "--without-ad-dc") ++ optionals (!enableLDAP) [
++ optionals enableKerberos [
"--with-system-mitkrb5"
"--with-system-mitkdc=${krb5Full}"
] ++ optionals (!enableLDAP) [
"--without-ldap" "--without-ldap"
"--without-ads" "--without-ads"
] ++ optional enableProfiling "--with-profiling-data" ] ++ optional enableProfiling "--with-profiling-data"