git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/samba: remove upstream deprecated syncPasswordsByPam option
commit8cd4d59a329c147a832b5aabd1484d2f31a1621e authorDoron Behar <doron.behar@gmail.com> dateSun 30 Aug 2020, 14:28 (6 years ago) parent5d8dd5c
2 files changed+1−15
nixos/modules/security/pam.nix−2 nixos/modules/services/network-filesystems/samba.nix+1−13
nixos/modules/security/pam.nix−2
@@ -429,8 +429,6 @@ let
429429 "password sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_authtok"}
430430 ${optionalString config.krb5.enable
431431 "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"}
432− ${optionalString config.services.samba.syncPasswordsByPam
433− "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"}
434432 ${optionalString cfg.enableGnomeKeyring
435433 "password optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"}
436434
nixos/modules/services/network-filesystems/samba.nix+1−13
@@ -26,7 +26,6 @@ let
2626 [global]
2727 security = ${cfg.securityType}
2828 passwd program = /run/wrappers/bin/passwd %u
29− pam password change = ${smbToString cfg.syncPasswordsByPam}
3029 invalid users = ${smbToString cfg.invalidUsers}
3130
3231 ${cfg.extraConfig}
@@ -67,6 +66,7 @@ in
6766{
6867 imports = [
6968 (mkRemovedOptionModule [ "services" "samba" "defaultShare" ] "")
69+ (mkRemovedOptionModule [ "services" "samba" "syncPasswordsByPam" ] "This option has been removed by upstream, see https://bugzilla.samba.org/show_bug.cgi?id=10669#c10")
7070 ];
7171
7272 ###### interface
@@ -124,18 +124,6 @@ in
124124 '';
125125 };
126126
127− syncPasswordsByPam = mkOption {
128− type = types.bool;
129− default = false;
130− description = ''
131− Enabling this will add a line directly after pam_unix.so.
132− Whenever a password is changed the samba password will be updated as well.
133− However, you still have to add the samba password once, using smbpasswd -a user.
134− If you don't want to maintain an extra password database, you still can send plain text
135− passwords which is not secure.
136− '';
137− };
138−
139127 invalidUsers = mkOption {
140128 type = types.listOf types.str;
141129 default = [ "root" ];