summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathijs Kwik <mathijs@bluescreen303.nl>2013-09-07 08:18:01 -0700
committerMathijs Kwik <mathijs@bluescreen303.nl>2013-09-07 08:18:01 -0700
commit71365b747814ebe3c837f61a28a81176b4725e25 (patch)
treefe72aa15bb8e406a4c7391178ad7aea046bd0691
parent40342e975d06ef14af296cc31f887fa2e275e0bd (diff)
parent8a01d244b1abd4e2eec26c19a0db0316b87100f0 (diff)
downloadnixlib-71365b747814ebe3c837f61a28a81176b4725e25.tar
nixlib-71365b747814ebe3c837f61a28a81176b4725e25.tar.gz
nixlib-71365b747814ebe3c837f61a28a81176b4725e25.tar.bz2
nixlib-71365b747814ebe3c837f61a28a81176b4725e25.tar.lz
nixlib-71365b747814ebe3c837f61a28a81176b4725e25.tar.xz
nixlib-71365b747814ebe3c837f61a28a81176b4725e25.tar.zst
nixlib-71365b747814ebe3c837f61a28a81176b4725e25.zip
Merge pull request #247 from bjornfor/wins-nsswitch
Add services.samba.nsswins option
-rw-r--r--modules/config/nsswitch.nix3
-rw-r--r--modules/services/network-filesystems/samba.nix12
2 files changed, 14 insertions, 1 deletions
diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
index 0a922756bf90..ad62b5597be8 100644
--- a/modules/config/nsswitch.nix
+++ b/modules/config/nsswitch.nix
@@ -7,6 +7,7 @@ with pkgs.lib;
 let
 
   inherit (config.services.avahi) nssmdns;
+  inherit (config.services.samba) nsswins;
 
 in
 
@@ -43,7 +44,7 @@ in
               passwd:    files ldap
               group:     files ldap
               shadow:    files ldap
-              hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} myhostname
+              hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} ${optionalString nsswins "wins"} myhostname
               networks:  files dns
               ethers:    files
               services:  files
diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 518142ba97b1..70a14487ea59 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -170,6 +170,16 @@ in
         example = "share";
       };
 
+      nsswins = mkOption {
+        default = false;
+        type = types.uniq types.bool;
+        description = ''
+          Whether to enable the WINS NSS (Name Service Switch) plug-in.
+          Enabling it allows applications to resolve WINS/NetBIOS names (a.k.a.
+          Windows machine names) by transparently querying the winbindd daemon.
+        '';
+      };
+
     };
 
   };
@@ -196,6 +206,8 @@ in
 
         users.extraGroups.smbguest.gid = config.ids.uids.smbguest;
 
+        system.nssModules = optional cfg.nsswins samba;
+
         systemd = {
           targets.samba = {
             description = "Samba server";