Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a113f1d6e937
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b4784dbb3418
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 16, 2020

  1. samba: Switch back to builtin Heimdal Kerberos 

    When not building with the experimental (!!) system MIT Kerberos, Samba
will use the builtin Heimdal Kerberos. For this reason, enableKerberos =
true will still include a krb5 implementation, built right into Samba.

There is no benefit in using MIT krb5, however it has some downsides
like not being able to assign computer GPOs [1].

The ArchWiki [2] also mentions this in their installation section.

[1]: https://lists.samba.org/archive/samba/2018-July/216779.html
[2]: https://wiki.archlinux.org/index.php/Samba/Active_Directory_domain_controller
    @dasJ
    dasJ committed Apr 16, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dasJ Janne Heß
    GPG key ID: 69165158F05265DF
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a3bfbbf View commit details

Commits on Jul 23, 2020

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

    samba: Switch back to builtin Heimdal Kerberos
    @flokli
    flokli authored Jul 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b4784db View commit details
Showing with 3 additions and 9 deletions.
  1. +3 −9 pkgs/servers/samba/4.x.nix
12 changes: 3 additions & 9 deletions pkgs/servers/samba/4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -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"