Release 3 (by relup.sh)

[packages/john.git] / john-mailer.patch

diff -urNp -x '*.orig' JohnTheRipper-af81c8de3ec1031c71307057d82fe1cd2bb8eb4b.org/run/mailer JohnTheRipper-af81c8de3ec1031c71307057d82fe1cd2bb8eb4b/run/mailer
--- JohnTheRipper-af81c8de3ec1031c71307057d82fe1cd2bb8eb4b.org/run/mailer	2019-04-15 23:07:24.000000000 +0200
+++ JohnTheRipper-af81c8de3ec1031c71307057d82fe1cd2bb8eb4b/run/mailer	2021-10-06 23:03:54.122657094 +0200
@@ -23,10 +23,11 @@ if [ $# -ne 1 ]; then
 fi
 
 # There's no need to mail users with these shells
-SHELLS=-,/bin/false,/dev/null,/bin/sync
+SHELLS=-,/bin/false,/dev/null,/bin/sync,/bin/true,/sbin/shutdown
 
 # Look for John in the same directory with this script
-DIR="`echo "$0" | sed 's,/[^/]*$,,'`"
+#DIR="`echo "$0" | sed 's,/[^/]*$,,'`"
+DIR="/usr/bin"
 
 # Let's start
 $DIR/john -show "$1" -shells:$SHELLS | sed -n 's/:.*//p' |
@@ -34,10 +35,13 @@ $DIR/john -show "$1" -shells:$SHELLS | s
 	SENT=0
 
 	while read LOGIN; do
-		echo Sending mail to "$LOGIN"...
+		echo Sending mail to / Wysylam maila do "$LOGIN"...
 
 # You'll probably want to edit the message below
-		mail -s 'Bad password' "$LOGIN" << EOF
+		mail -s 'Bad password / Zle haslo' "$LOGIN" << EOF
+--------------------------------------------------------------------------
+[EN]
+
 Hello!
 
 Your password for account "$LOGIN" is insecure.  Please change it as soon
@@ -45,6 +49,17 @@ as possible.
 
 Yours,
 	Password Checking Robot.
+--------------------------------------------------------------------------
+[PL]
+
+Witaj!
+
+Twoje haslo dla konta "$LOGIN" nie jest bezpieczne. Prosze zmien
+je tak szybko jak to jest mozliwe.
+
+Twoj,
+	Robot sprawdzajacy hasla.
+--------------------------------------------------------------------------
 EOF
 
 		SENT=$(($SENT+1))