Merge branch 'master' of feistymeow.org:feisty_meow

[feisty_meow.git] / scripts / security / password_functions.sh

diff --git a/scripts/security/password_functions.sh b/scripts/security/password_functions.sh
index ca365fd263efe101f2924fc8f36fa2ec1246191b..490b94d8189c20b03340cecf5c4556761dab1249 100644 (file)
--- a/scripts/security/password_functions.sh
+++ b/scripts/security/password_functions.sh
@@ -28,8 +28,6 @@ function load_password()
 
   # return the password in the variable they provided.
   eval $varname="$passwd"
-#echo varname is: $varname
-#echo new value of that variable is ${!varname}
 }
 
 # stores a password into a password file.  the password file should be the
@@ -48,13 +46,13 @@ and (2) the password that should be stored.
   fi
 
   echo "$passwd" > "$passfile"
-  test_or_die "writing password into the file $passfile"
+  exit_on_error "writing password into the file $passfile"
 
   chown root:root "$passfile"
-  test_or_die "chowning the password file to root ownership for: $passfile"
+  exit_on_error "chowning the password file to root ownership for: $passfile"
 
   chmod 600 "$passfile"
-  test_or_die "restricting permissions on password file for: $passfile"
+  exit_on_error "restricting permissions on password file for: $passfile"
 }
 
 # reads a password from the console, without echoing the letters when they
@@ -75,8 +73,6 @@ function read_password()
   stty $stty_orig
   # return the password in the variable they provided.
   eval $varname="$the_passwd"
-#echo varname is: $varname
-#echo new value of that variable is ${!varname}
 }