Dev

script-user-reset-password

@@ -16,17 +16,14 @@ is_root
 
 id -u "$user" || echo "User $user does not exist" && exit 1
 
-if [[ "$password" == "reset" ]]; then
-    ask_ok "Reset user $user's password?" || return $?
-    passwd --expire "$user"
-    password="$user" # For samba
-else
-    ask_ok "Change user $user's password to $password?" && \
-    echo "$user":"$password" | chpasswd
-fi
+password="${password:$user}" # For samba
 
-ask_ok "Change user $user's Samba ppassword to $password?" && \
+ask_ok "Change user $user's password to $password?"
+echo "$user":"$password" | chpasswd
+echo "Expiring user password"
+passwd --expire "$user"
+
+ask_ok "Change user $user's Samba password to $password?" && \
 (echo "$password"; echo "$password") | smbpasswd -a -s "$user"
 
-
 exit $?