--- nessus-core.orig/nessus-adduser.in 2004-12-10 20:40:20.000000000 +0100 +++ nessus-core/nessus-adduser.in 2005-07-03 15:13:23.000000000 +0200 @@ -124,7 +124,7 @@ do echo $Xn "Login : $Xc" read login - if [ -d $localstatedir/nessus/users/$login ]; + if [ -d $localstatedir/lib/nessus/users/$login ]; then echo "This login already exists. Choose another one" else @@ -250,9 +250,7 @@ #echo "$login:$password" > $TMPDIR/adduser.$$ -chmod 0700 "$localstatedir/nessus/" -mkdir -p "$localstatedir/nessus/users/$login" -chmod 0700 "$localstatedir/nessus/users/$login" +mkdir -m 0700 -p "$localstatedir/lib/nessus/users/$login" @@ -263,14 +261,12 @@ # Create the auth. dir, which contains the user rules, # password, and plugin acl # -mkdir -p "$localstatedir/nessus/users/$login/auth" -chmod 0700 "$localstatedir/nessus/users/$login/auth" +mkdir -m 0700 -p "$localstatedir/lib/nessus/users/$login/auth" # # Create the plugins dir, which contains the user plugins # -mkdir -p "$localstatedir/nessus/users/$login/plugins" -chmod 0700 "$localstatedir/nessus/users/$login/plugins" +mkdir -m 0700 -p "$localstatedir/lib/nessus/users/$login/plugins" @@ -282,17 +278,17 @@ } SEED=`(echo $SEED; date; df; ls -l; echo $URANDOM) | $MD5CMD | awk '{print $1}'` H=`echo $Xn $SEED$password$Xc | $MD5CMD | awk '{print $1}'` - echo $H $SEED > "$localstatedir/nessus/users/$login/auth/hash" + echo $H $SEED > "$localstatedir/lib/nessus/users/$login/auth/hash" else - echo "$password" > "$localstatedir/nessus/users/$login/auth/password" + echo "$password" > "$localstatedir/lib/nessus/users/$login/auth/password" fi elif [ "$auth" = "cert" ]; then - echo "$dn" > "$localstatedir/nessus/users/$login/auth/dname" + echo "$dn" > "$localstatedir/lib/nessus/users/$login/auth/dname" fi -cp $TMPDIR/nessus-adduser.$$/rules.$$ "$localstatedir/nessus/users/$login/auth/rules" +cp $TMPDIR/nessus-adduser.$$/rules.$$ "$localstatedir/lib/nessus/users/$login/auth/rules"