|
|
ec6044c |
diff -up c50a/Crack.FHS c50a/Crack
|
|
|
f5bc6a0 |
--- c50a/Crack.FHS 2010-03-31 10:07:08.233610673 -0400
|
|
|
f5bc6a0 |
+++ c50a/Crack 2010-03-31 10:07:08.236608122 -0400
|
|
|
f5bc6a0 |
@@ -36,7 +36,9 @@ node=`uname -n`
|
|
|
ec6044c |
|
|
|
ec6044c |
old_wd=`pwd`
|
|
|
ec6044c |
|
|
|
ec6044c |
-CRACK_HOME=${CRACK_HOME:-"/var/lib/crack"}
|
|
|
ec6044c |
+CRACK_HOME=${CRACK_HOME:-"/usr/share/crack"}
|
|
|
ec6044c |
+CRACK_BIN_HOME=${CRACK_BIN_HOME:-"/usr/libexec/crack/"}
|
|
|
f5bc6a0 |
+CRACK_STATE_DIR=${CRACK_STATE_DIR:-"/var/lib/crack"}
|
|
|
ec6044c |
|
|
|
ec6044c |
if cd $CRACK_HOME
|
|
|
ec6044c |
then
|
|
|
f5bc6a0 |
@@ -47,6 +49,7 @@ else
|
|
|
ec6044c |
fi
|
|
|
ec6044c |
|
|
|
ec6044c |
export CRACK_HOME
|
|
|
ec6044c |
+export CRACK_BIN_HOME
|
|
|
ec6044c |
|
|
|
ec6044c |
###
|
|
|
ec6044c |
# Flagwaving
|
|
|
f5bc6a0 |
@@ -56,6 +59,7 @@ echo "Crack $version: The Password Crack
|
|
|
ec6044c |
echo "(c) Alec Muffett, 1991, 1992, 1993, 1994, 1995, 1996"
|
|
|
ec6044c |
echo "System:" `uname -a 2>/dev/null`
|
|
|
ec6044c |
echo "Home: $CRACK_HOME"
|
|
|
ec6044c |
+echo "Script Home: $CRACK_BIN_HOME"
|
|
|
ec6044c |
echo "Invoked: $0 $*"
|
|
|
ec6044c |
|
|
|
ec6044c |
###
|
|
|
f5bc6a0 |
@@ -205,7 +209,7 @@ fi
|
|
|
ec6044c |
# Reset PATH in advance
|
|
|
ec6044c |
###
|
|
|
ec6044c |
|
|
|
ec6044c |
-PATH=$CRACK_HOME/scripts:$CRACK_HOME/$bindir:$PATH
|
|
|
ec6044c |
+PATH=$CRACK_HOME/scripts:$CRACK_BIN_HOME/$bindir:$PATH
|
|
|
ec6044c |
export PATH
|
|
|
ec6044c |
|
|
|
ec6044c |
###
|
|
|
f5bc6a0 |
@@ -222,7 +226,7 @@ fi
|
|
|
ec6044c |
# Make the dictionary passes
|
|
|
ec6044c |
###
|
|
|
ec6044c |
|
|
|
ec6044c |
-dp=run/dict
|
|
|
f5bc6a0 |
+dp=$CRACK_STATE_DIR/run/dict
|
|
|
ec6044c |
dplf=$dp/.dictmade
|
|
|
ec6044c |
|
|
|
ec6044c |
if [ ! -f $dplf ]
|
|
|
f5bc6a0 |
@@ -253,21 +257,21 @@ fi
|
|
|
ec6044c |
###
|
|
|
ec6044c |
|
|
|
ec6044c |
# F-files are feedback
|
|
|
ec6044c |
-crackin=run/I$node.$$ # I-files are input to the cracker
|
|
|
ec6044c |
-crackfb=run/D.boot.$$ # D-files are data from the cracker/fb
|
|
|
ec6044c |
-crackout=run/D$node.$$
|
|
|
ec6044c |
-crackerr=run/E$node.$$ # E-files are errors from the cracker
|
|
|
f5bc6a0 |
+crackin=$CRACK_STATE_DIR/run/I$node.$$ # I-files are input to the cracker
|
|
|
f5bc6a0 |
+crackfb=$CRACK_STATE_DIR/run/D.boot.$$ # D-files are data from the cracker/fb
|
|
|
f5bc6a0 |
+crackout=$CRACK_STATE_DIR/run/D$node.$$
|
|
|
f5bc6a0 |
+crackerr=$CRACK_STATE_DIR/run/E$node.$$ # E-files are errors from the cracker
|
|
|
ec6044c |
|
|
|
ec6044c |
if [ "x$killflag" = "x" ]
|
|
|
ec6044c |
then
|
|
|
ec6044c |
- crackkf=run/K$node.$$ # K-files are kill file for 'plaster'
|
|
|
f5bc6a0 |
+ crackkf=$CRACK_STATE_DIR/run/K$node.$$ # K-files are kill file for 'plaster'
|
|
|
ec6044c |
else
|
|
|
ec6044c |
crackkf=$killflag
|
|
|
ec6044c |
fi
|
|
|
ec6044c |
|
|
|
ec6044c |
if [ "x$mailflag" != "x" ]
|
|
|
ec6044c |
then
|
|
|
ec6044c |
- crackmf=run/M$node.$$ # M-files are for mail commands
|
|
|
f5bc6a0 |
+ crackmf=$CRACK_STATE_DIR/run/M$node.$$ # M-files are for mail commands
|
|
|
ec6044c |
fi
|
|
|
ec6044c |
|
|
|
ec6044c |
|
|
|
f5bc6a0 |
@@ -302,7 +306,7 @@ then
|
|
|
ec6044c |
echo "Crack: Merging password files..."
|
|
|
ec6044c |
|
|
|
ec6044c |
(
|
|
|
ec6044c |
- cat run/F-merged # first the feedback
|
|
|
f5bc6a0 |
+ cat $CRACK_STATE_DIR/run/F-merged # first the feedback
|
|
|
ec6044c |
|
|
|
ec6044c |
while [ "x$1" != "x" ]
|
|
|
ec6044c |
do
|
|
|
ec6044c |
diff -up c50a/Reporter.FHS c50a/Reporter
|
|
|
f5bc6a0 |
--- c50a/Reporter.FHS 2010-03-31 10:07:08.233610673 -0400
|
|
|
f5bc6a0 |
+++ c50a/Reporter 2010-03-31 10:07:08.236608122 -0400
|
|
|
f5bc6a0 |
@@ -10,8 +10,8 @@
|
|
|
ec6044c |
# document which accompanies distributions of Crack v5.0 and upwards.
|
|
|
ec6044c |
###
|
|
|
ec6044c |
|
|
|
ec6044c |
-CRACK_HOME=${CRACK_HOME:-"/var/lib/crack"}
|
|
|
f5bc6a0 |
-cd $CRACK_HOME
|
|
|
f5bc6a0 |
+CRACK_STATE_DIR=${CRACK_STATE_DIR:-"/var/lib/crack/"}
|
|
|
f5bc6a0 |
+cd $CRACK_STATE_DIR
|
|
|
ec6044c |
|
|
|
ec6044c |
tfile=run/T$$
|
|
|
f5bc6a0 |
date=`date`
|
|
|
f5bc6a0 |
diff -up c50a/src/util/kickdict.c.FHS c50a/src/util/kickdict.c
|
|
|
f5bc6a0 |
--- c50a/src/util/kickdict.c.FHS 2010-03-31 10:12:34.665486313 -0400
|
|
|
f5bc6a0 |
+++ c50a/src/util/kickdict.c 2010-03-31 10:12:44.187480349 -0400
|
|
|
f5bc6a0 |
@@ -15,7 +15,7 @@
|
|
|
f5bc6a0 |
#undef DEBUG2
|
|
|
f5bc6a0 |
|
|
|
f5bc6a0 |
static char dictconf[] = "conf/dictrun.conf";
|
|
|
f5bc6a0 |
-static char dictgrps[] = "run/dict";
|
|
|
f5bc6a0 |
+static char dictgrps[] = "/var/lib/crack/run/dict";
|
|
|
f5bc6a0 |
static char xprogram[] = "dictfilt | crack-sort | uniq";
|
|
|
f5bc6a0 |
|
|
|
f5bc6a0 |
int
|