diff options
| author | Tim Keller <tjk@tjkeller.xyz> | 2026-08-24 18:10:41 -0500 |
|---|---|---|
| committer | Tim Keller <tjk@tjkeller.xyz> | 2026-08-24 18:10:41 -0500 |
| commit | 1c9ffed96c3d348eb2db3d03c420e6c79ec16220 (patch) | |
| tree | dea14b61cf4b03c8becb7257d3d7bc0bf1c96224 | |
| parent | 8cd20df3b01b0d75be85809add88bbfa4a0a3b37 (diff) | |
| download | nixos-1c9ffed96c3d348eb2db3d03c420e6c79ec16220.tar.xz nixos-1c9ffed96c3d348eb2db3d03c420e6c79ec16220.zip | |
fix enrollusers
| -rw-r--r-- | nixos/services/fileshares.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/services/fileshares.nix b/nixos/services/fileshares.nix index d90018a..e8981c4 100644 --- a/nixos/services/fileshares.nix +++ b/nixos/services/fileshares.nix @@ -83,7 +83,7 @@ mustChangePassword = lib.mkEnableOption "force user to set new password on first logon"; disabled = lib.mkEnableOption "disable user"; script = lib.mkOption { - type = lib.types.attrsOf lib.types.str; + type = lib.types.str; readOnly = true; internal = true; visible = false; @@ -99,18 +99,18 @@ else "" ; in '' - if ! ${pkgs.samba}/bin/pbdedit -L 2>/dev/null | cut -d: -f1 | grep -qx ${name} > /dev/null; then + if ! ${pkgs.samba}/bin/pdbedit -L 2>/dev/null | cut -d: -f1 | grep -qx ${name} > /dev/null; then echo "samba: enrolling ${name}" pw="${lib.escapeShellArg pw}" # set password to contents of pw printf '%s\n%s\n' "$pw" "$pw" | ${pkgs.samba}/bin/smbpasswd -s -a ${name} >/dev/null # set password hash directly if hashedPasswordFile is used ${lib.optionalString (config.hashedPasswordFile != null) '' - ${pkgs.samba}/bin/pbdedit -u ${name} --set-nt-hash="$pw" > /dev/null + ${pkgs.samba}/bin/pdbedit -u ${name} --set-nt-hash="$pw" > /dev/null ''} # set must change password ${lib.optionalString config.mustChangePassword '' - ${pkgs.samba}/bin/pbdedit -u ${name} --pwd-must-change-time=0 > /dev/null + ${pkgs.samba}/bin/pdbedit -u ${name} --pwd-must-change-time=0 > /dev/null ''} fi # enable / disable user |