From b89d02a5d137c4bcf23cdd3ffafb0326e422bb7f Mon Sep 17 00:00:00 2001
From: Bryan Roessler <bryanroessler@gmail.com>
Date: Sun, 23 Jan 2022 12:53:32 -0500
Subject: [PATCH] Fix edge case script-user-reset-password

---
 script-user-reset-password | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/script-user-reset-password b/script-user-reset-password
index 33fd02ac..08b7eedc 100755
--- a/script-user-reset-password
+++ b/script-user-reset-password
@@ -32,10 +32,11 @@ password="${password:-$user}" # For samba
 
 ask_ok "Change user $user's password to $password?" || exit
 echo "$user":"$password" | chpasswd
-echo "Expiring user password"
-passwd --expire "$user"
 
-ask_ok "Change user $user's Samba password to $password?" || exit
-(echo "$password"; echo "$password") | smbpasswd -a -s "$user"
+ask_ok "Require user $user to reset password on next login?" && 
+    passwd --expire "$user"
 
-exit $?
+ask_ok "Change user $user's Samba password to $password?" &&
+    (echo "$password"; echo "$password") | smbpasswd -a -s "$user"
+
+exit 0