diff options
| author | Florian Klink <flokli@flokli.de> | 2020-07-23 14:33:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-23 14:33:06 +0200 |
| commit | b4784dbb34187bc0a99d950ed32563bd4f919912 (patch) | |
| tree | d5608239d3d9fe06279006fdcaac951e8c75b71a /pkgs/servers/samba | |
| parent | a113f1d6e93796083cb64ff782a86025527929eb (diff) | |
| parent | a3bfbbf8a0d0d7109741ae55069a1f7df2c65147 (diff) | |
Merge pull request #85362 from helsinki-systems/fix-samba-kerberos
samba: Switch back to builtin Heimdal Kerberos
Diffstat (limited to 'pkgs/servers/samba')
| -rw-r--r-- | pkgs/servers/samba/4.x.nix | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 0aae779106a53..e9812e9884e90 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -31,7 +31,6 @@ , enableProfiling ? true , enableMDNS ? false, avahi , enableDomainController ? false, gpgme, lmdb -, enableKerberos ? true, krb5Full , enableRegedit ? true, ncurses , enableCephFS ? false, libceph , enableGlusterFS ? false, glusterfs, libuuid @@ -92,7 +91,6 @@ stdenv.mkDerivation rec { ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi ++ optionals enableDomainController [ gpgme lmdb ] - ++ optional enableKerberos krb5Full ++ optional enableRegedit ncurses ++ optional (enableCephFS && stdenv.isLinux) libceph ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ] @@ -116,13 +114,9 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--disable-rpath" - ] ++ singleton (if enableDomainController - then "--with-experimental-mit-ad-dc" - else "--without-ad-dc") - ++ optionals enableKerberos [ - "--with-system-mitkrb5" - "--with-system-mitkdc=${krb5Full}" - ] ++ optionals (!enableLDAP) [ + ] ++ optional (!enableDomainController) + "--without-ad-dc" + ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ] ++ optional enableProfiling "--with-profiling-data" |