Mirrors/backupninja
1
0
Fork 0
mirror of https://0xacab.org/liberate/backupninja.git synced 2024-11-13 22:32:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

applied patch to rdiff.helper, removed /etc/passwd from mysql handler.

Browse Source
This commit is contained in:
Elijah Saxon 2005-10-07 16:02:27 +00:00
parent 55427e72e2
commit 02ffef7501
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/changelog
View File

@ -1,7 +1,12 @@
version 0.9 -- unreleased version 0.9 -- unreleased
removed erroneous magic file marker in pgsql handler *** IMPORTANT CHANGE, UPGRADE AT ONCE ***
fixed insecure temporary file creation fixed insecure temporary file creation
*****************************************
removed erroneous magic file marker in pgsql handler
fixed incorrect find positional fixed incorrect find positional
changed direct grep of /etc/passwd to getent passwd.
rdiff helper has much better information on failed ssh attempt
(patch from cmccallum@thecsl.org).
version 0.8 -- September 15 2005 version 0.8 -- September 15 2005
added pgsql (PostgreSQL) handler, with vservers support. added pgsql (PostgreSQL) handler, with vservers support.

2
handlers/mysql
View File

@ -95,7 +95,7 @@ fi
defaultsfile="" defaultsfile=""
if [ "$dbusername" != "" -a "$dbpassword" != "" ]; then if [ "$dbusername" != "" -a "$dbpassword" != "" ]; then
home=`grep '^root:' /etc/passwd | awk -F: '{print $6}'` home=`getent passwd "root" | awk -F: '{print $6}'`
[ -d $home ] || fatal "Can't find root's home directory ($home)." [ -d $home ] || fatal "Can't find root's home directory ($home)."
mycnf="$home/.my.cnf" mycnf="$home/.my.cnf"
if [ -f $mycnf ]; then if [ -f $mycnf ]; then

9
handlers/rdiff.helper
View File

@ -81,7 +81,14 @@ do_rdiff_con() {
echo "Copying root's public ssh key to authorized_keys of $rdiff_user@$rdiff_host. Specify the password for user $rdiff_user@$rdiff_host." echo "Copying root's public ssh key to authorized_keys of $rdiff_user@$rdiff_host. Specify the password for user $rdiff_user@$rdiff_host."
ssh-copy-id -i /root/.ssh/id_[rd]sa.pub $rdiff_user@$rdiff_host ssh-copy-id -i /root/.ssh/id_[rd]sa.pub $rdiff_user@$rdiff_host
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
msgBox "rdiff action wizard: error" "Failed to connect to $rdiff_user@$rdiff_host. Make sure you have the username and password correct." echo "Couldn't copy root's public ssh key to authorized_keys of $rdiff_user@$rdiff_host. This time, testing whether directory is writable."
ssh $rdiff_user@$rdiff_host 'test -w .ssh || test -w .'
case $? in
0 ) msgBox "rdiff action wizard: error" "Directories are writable: Probably just a typo the first time." ;;
1 ) msgBox "rdiff action wizard: error" "Connected successfully to $rdiff_user@$rdiff_host, but unable to write. Check ownership and modes of ~$rdiff_user on $rdiff_host." ;;
255 ) msgBox "rdiff action wizard: error" "Failed to connect to $rdiff_user@$rdiff_host. Check hostname, username, and password." ;;
* ) msgBox "rdiff action wizard: error" "Unexpected error." ;;
esac
return return
else else
echo "Done. hit return to continue" echo "Done. hit return to continue"