From 103b0c682baaeb239a06fb4ea3a0ef977a848b8e Mon Sep 17 00:00:00 2001
From: Bryan Roessler <bryanroessler@gmail.com>
Date: Sun, 23 Jan 2022 13:45:28 -0500
Subject: [PATCH] Fix edge case script-user-reset-password

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

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