diff --git a/heartbeat/mysql b/heartbeat/mysql
index ee2a11e32..c330af0d8 100644
--- a/heartbeat/mysql
+++ b/heartbeat/mysql
@@ -1,455 +1,455 @@
 #!/bin/sh
 #
 # 
 # MySQL
 #
 # Description:	Manages a MySQL database as Linux-HA resource
 
 #
 # Author:	Alan Robertson 		: DB2 Script
 # Author:	Jakub Janczak  		: Rewrite as MySQL
 # Author:	Andrew Beekhof 		: Cleanup and import
 # Author:	Sebastian Reitenbach    : add OpenBSD defaults, more cleanup
 # Author:  Narayan Newton      : Add Gentoo/Debian defaults
 #
 # Support:	linux-ha@lists.linux-ha.org
 # License:	GNU General Public License (GPL)
 # Copyright:	(C) 2002 - 2005 International Business Machines, Inc.
 #
 # An example usage in /etc/ha.d/haresources: 
 #       node1  10.0.0.170 mysql
 #
 # See usage() function below for more details...
 #
 # OCF instance parameters:
 #   OCF_RESKEY_binary
 #   OCF_RESKEY_config
 #   OCF_RESKEY_datadir
 #   OCF_RESKEY_user
 #   OCF_RESKEY_group
 #   OCF_RESKEY_test_table
 #   OCF_RESKEY_test_user
 #   OCF_RESKEY_test_password
 #   OCF_RESKEY_enable_creation
 #   OCF_RESKEY_additional_parameters
 #   OCF_RESKEY_log
 #   OCF_RESKEY_pid
 #   OCF_RESKEY_socket
 
 #######################################################################
 # Initialization:
 
 . ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
 
 #######################################################################
 
 # Fill in some defaults if no values are specified
 HOSTOS=`uname`
 if [ "X${HOSTOS}" = "XOpenBSD" ];then
 OCF_RESKEY_binary_default="/usr/local/bin/mysqld_safe"
 OCF_RESKEY_config_default="/etc/my.cnf"
 OCF_RESKEY_datadir_default="/var/mysql"
 OCF_RESKEY_user_default="_mysql"
 OCF_RESKEY_group_default="_mysql"
 OCF_RESKEY_log_default="/var/log/mysqld.log"
 OCF_RESKEY_pid_default="/var/mysql/mysqld.pid"
 OCF_RESKEY_socket_default="/var/run/mysql/mysql.sock"
 OCF_RESKEY_test_user_default="root"
 OCF_RESKEY_test_table_default="mysql.user"
 OCF_RESKEY_test_passwd_default=""
 OCF_RESKEY_enable_creation_default=0
 OCF_RESKEY_additional_parameters_default=""
 else
 OCF_RESKEY_binary_default="/usr/bin/safe_mysqld"
 OCF_RESKEY_config_default="/etc/my.cnf"
 OCF_RESKEY_datadir_default="/var/lib/mysql"
 OCF_RESKEY_user_default="mysql"
 OCF_RESKEY_group_default="mysql"
 OCF_RESKEY_log_default="/var/log/mysqld.log"
 OCF_RESKEY_pid_default="/var/run/mysql/mysqld.pid"
 OCF_RESKEY_socket_default="/var/lib/mysql/mysql.sock"
 OCF_RESKEY_test_user_default="root"
 OCF_RESKEY_test_table_default="mysql.user"
 OCF_RESKEY_test_passwd_default=""
 OCF_RESKEY_enable_creation_default=0
 OCF_RESKEY_additional_parameters_default=""
 fi
 
 : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
 MYSQL_BINDIR=`dirname ${OCF_RESKEY_binary}`
 
 : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}}
 : ${OCF_RESKEY_datadir=${OCF_RESKEY_datadir_default}}
 
 : ${OCF_RESKEY_user=${OCF_RESKEY_user_default}}
 : ${OCF_RESKEY_group=${OCF_RESKEY_group_default}}
 
 : ${OCF_RESKEY_log=${OCF_RESKEY_log_default}}
 : ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
 : ${OCF_RESKEY_socket=${OCF_RESKEY_socket_default}}
 
 : ${OCF_RESKEY_test_user=${OCF_RESKEY_test_user_default}}
 : ${OCF_RESKEY_test_table=${OCF_RESKEY_test_table_default}}
 : ${OCF_RESKEY_test_passwd=${OCF_RESKEY_test_passwd_default}}
 
 : ${OCF_RESKEY_enable_creation=${OCF_RESKEY_enable_creation_default}}
 : ${OCF_RESKEY_additional_parameters=${OCF_RESKEY_additional_parameters_default}}
 
 usage() {
   cat <<UEND
 	usage: $0 (start|stop|validate-all|meta-data|monitor)
 
 	$0 manages a MySQL Database as an HA resource.
 
 	The 'start' operation starts the database.
 	The 'stop' operation stops the database.
 	The 'status' operation reports whether the database is running
 	The 'monitor' operation reports whether the database seems to be working
 	The 'validate-all' operation reports whether the parameters are valid
 
 UEND
 }
 
 meta_data() {
 	cat <<END
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="mysql">
 <version>1.0</version>
 
 <longdesc lang="en">
 Resource script for MySQL. 
 It manages a MySQL Database instance as an HA resource.
 </longdesc>
 <shortdesc lang="en">MySQL resource agent</shortdesc>
 
 <parameters>
 
 <parameter name="binary" unique="0" required="0">
 <longdesc lang="en">
 Location of the MySQL binary
 </longdesc>
 <shortdesc lang="en">MySQL binary</shortdesc>
 <content type="string" default="${OCF_RESKEY_binary_default}" />
 </parameter>
 
 <parameter name="config" unique="0" required="0">
 <longdesc lang="en">
 Configuration file
 </longdesc>
 <shortdesc lang="en">MySQL config</shortdesc>
 <content type="string" default="${OCF_RESKEY_config_default}" />
 </parameter>
 
 <parameter name="datadir" unique="0" required="0">
 <longdesc lang="en">
 Directory containing databases
 </longdesc>
 <shortdesc lang="en">MySQL datadir</shortdesc>
 <content type="string" default="${OCF_RESKEY_datadir_default}" />
 </parameter>
 
 <parameter name="user" unique="0" required="0">
 <longdesc lang="en">
 User running MySQL daemon
 </longdesc>
 <shortdesc lang="en">MySQL user</shortdesc>
 <content type="string" default="${OCF_RESKEY_user_default}" />
 </parameter>
 
 <parameter name="group" unique="0" required="0">
 <longdesc lang="en">
 Group running MySQL daemon (for logfile and directory permissions)
 </longdesc>
 <shortdesc lang="en">MySQL group</shortdesc>
 <content type="string" default="${OCF_RESKEY_group_default}"/>
 </parameter>
 
 <parameter name="log" unique="0" required="0">
 <longdesc lang="en">
 The logfile to be used for mysqld.
 </longdesc>
 <shortdesc lang="en">MySQL log file</shortdesc>
 <content type="string" default="${OCF_RESKEY_log_default}"/>
 </parameter>
 
 <parameter name="pid" unique="0" required="0">
 <longdesc lang="en">
 The pidfile to be used for mysqld.
 </longdesc>
 <shortdesc lang="en">MySQL pid file</shortdesc>
 <content type="string" default="${OCF_RESKEY_pid_default}"/>
 </parameter>
 
 <parameter name="socket" unique="0" required="0">
 <longdesc lang="en">
 The socket to be used for mysqld.
 </longdesc>
 <shortdesc lang="en">MySQL socket</shortdesc>
 <content type="string" default="${OCF_RESKEY_socket_default}"/>
 </parameter>
 
 <parameter name="test_table" unique="0" required="0">
 <longdesc lang="en">
 Table to be tested in monitor statement (in database.table notation)
 </longdesc>
 <shortdesc lang="en">MySQL test table</shortdesc>
 <content type="string" default="${OCF_RESKEY_test_table_default}" />
 </parameter>
 
 <parameter name="test_user" unique="0" required="0">
 <longdesc lang="en">
 MySQL test user
 </longdesc>
 <shortdesc lang="en">MySQL test user</shortdesc>
 <content type="string" default="${OCF_RESKEY_test_user_default}" />
 </parameter>
 
 <parameter name="test_passwd" unique="0" required="0">
 <longdesc lang="en">
 MySQL test user password
 </longdesc>
 <shortdesc lang="en">MySQL test user password</shortdesc>
 <content type="string" default="${OCF_RESKEY_test_passwd_default}" />
 </parameter>
 
 <parameter name="enable_creation" unique="0" required="0">
 <longdesc lang="en">
 If the MySQL database does not exist, it will be created 
 </longdesc>
 <shortdesc lang="en">Create the database if it does not exist</shortdesc>
 <content type="integer" default="${OCF_RESKEY_enable_creation_default}"/>
 </parameter>
 
 <parameter name="additional_parameters" unique="0" required="0">
 <longdesc lang="en">
 Additional parameters which are passed to the mysqld on startup. 
 (e.g. --skip-external-locking or --skip-grant-tables)
 </longdesc>
 <shortdesc lang="en">Additional paramters to pass to mysqld</shortdesc>
 <content type="integer" default="${OCF_RESKEY_additional_parameters_default}"/>
 </parameter>
 
 </parameters>
 
 <actions>
 <action name="start" timeout="120" />
 <action name="stop" timeout="120" />
 <action name="status" timeout="60" />
 <action name="monitor" depth="0" timeout="30" interval="10" start-delay="10" />
 <action name="validate-all" timeout="5" />
 <action name="meta-data" timeout="5" />
 </actions>
 </resource-agent>
 END
 }
 
 mysql_validate() {
 # checking the parameters
     if [ ! -x $OCF_RESKEY_binary ]; then
 	ocf_log err "mysqld binary $OCF_RESKEY_binary does not exist or is not executable";
 	return $OCF_ERR_INSTALLED;
     fi
 
     if [ ! -f $OCF_RESKEY_config ]; then
 	ocf_log err "Config $OCF_RESKEY_config doesn't exist";
 	return $OCF_ERR_CONFIGURED;
     fi
     
     if [ ! -d $OCF_RESKEY_datadir ]; then
 	ocf_log err "Datadir $OCF_RESKEY_datadir doesn't exist";
 	return $OCF_ERR_CONFIGURED;
     fi
     
     getent passwd $OCF_RESKEY_user >/dev/null 2>&1
     if [ ! $? -eq 0 ]; then
 	ocf_log err "User $OCF_RESKEY_user doesn't exit";
 	return $OCF_ERR_INSTALLED;
     fi
     
     getent group $OCF_RESKEY_group >/dev/null 2>&1
     if [ ! $? -eq 0 ]; then
 	ocf_log err "Group $OCF_RESKEY_group doesn't exist";
 	return $OCF_ERR_INSTALLED;
     fi
     true
 }
 
 mysql_status() {
 	if [ ! -e $OCF_RESKEY_pid ]; then
 		ocf_log debug "MySQL is not running"
 		return $OCF_NOT_RUNNING;
 	fi
 	
 	pid=`cat $OCF_RESKEY_pid`;
 	if [ -d /proc -a -d /proc/1 ]; then
 		[ "u$pid" != "u" -a -d /proc/$pid ]
 	else
 		kill -0 $pid >/dev/null 2>&1
 	fi
 
 	if [ $? -eq 0 ]; then
 		return $OCF_SUCCESS;
 	else	
 		ocf_log debug "MySQL not running: removing old PID file"
 		rm -f $OCF_RESKEY_pid
 		return $OCF_NOT_RUNNING;
 	fi
 }
 
 mysql_monitor() {
     mysql_status
     rc=$?
 
     if [ $OCF_CHECK_LEVEL = 0 -o $rc != 0 ]; then
 	return $rc
     fi
 
     # Do a detailed status check
     buf=`echo "SELECT * FROM $OCF_RESKEY_test_table" | mysql --user=$OCF_RESKEY_test_user --password=$OCF_RESKEY_test_passwd --socket=$OCF_RESKEY_socket -O connect_timeout=1 2>&1`
     rc=$?
     if [ ! $rc -eq 0 ]; then
 	ocf_log err "MySQL $test_table monitor failed:";
 	if [ ! -z "$buf" ]; then ocf_log err $buf; fi
 	return $OCF_ERR_GENERIC;
     else
 	ocf_log info "MySQL monitor succeded";
 	return $OCF_SUCCESS;
     fi
 }
 
 mysql_start() {
     mysql_status
     if [ $? = $OCF_SUCCESS ]; then
 	ocf_log info "MySQL already running"
 	return $OCF_SUCCESS
     fi
 
     touch $OCF_RESKEY_log
     chown $OCF_RESKEY_user:$OCF_RESKEY_group $OCF_RESKEY_log
     chmod 0640 $OCF_RESKEY_log
     [ -x /sbin/restorecon ] && /sbin/restorecon $OCF_RESKEY_log
     
     if [ "$OCF_RESKEY_enable_creation" = 1 -a ! -d $OCF_RESKEY_datadir/mysql ] ; then	
         ocf_log info "Initializing MySQL database: " 
 	$MYSQL_BINDIR/mysql_install_db --datadir=$OCF_RESKEY_datadir
         rc=$?
         if [ $rc -ne 0 ] ; then
 	    ocf_log err "Initialization failed: $rc";
             exit $OCF_ERR_GENERIC
         fi
         chown -R $OCF_RESKEY_user:$OCF_RESKEY_group $OCF_RESKEY_datadir
     fi
 
     pid_dir=`dirname $OCF_RESKEY_pid`
     if ! su -s /bin/sh - $OCF_RESKEY_user -c "test -w $pid_dir"; then
 	ocf_log err "Directory $pid_dir for pidfile $OCF_RESKEY_pid is not writable by $OCF_RESKEY_user"
 	return $OCF_ERR_PERM;
     fi
     if [ ! -d $pid_dir ] ; then
 	ocf_log info "Creating PID dir: $pid_dir"
 	mkdir -p $pid_dir
 	chown $OCF_RESKEY_user:$OCF_RESKEY_group $pid_dir
     fi
 
     socket_dir=`dirname $OCF_RESKEY_socket`
     if [ ! -d $socket_dir ] ; then
 	ocf_log info "Creating socket dir: $socket_dir"
 	mkdir -p $socket_dir
 	chown $OCF_RESKEY_user:$OCF_RESKEY_group $socket_dir
     fi
 
     # Uncomment to perform permission clensing
     # - not convinced this should be enabled by default
     #
     #chmod 0755 $OCF_RESKEY_datadir
     #chown -R $OCF_RESKEY_user $OCF_RESKEY_datadir
     #chgrp -R $OCF_RESKEY_group $OCF_RESKEY_datadir
 
     ${OCF_RESKEY_binary}  --defaults-file=$OCF_RESKEY_config --pid-file=$OCF_RESKEY_pid --socket=$OCF_RESKEY_socket --datadir=$OCF_RESKEY_datadir --user=$OCF_RESKEY_user $OCF_RESKEY_additional_parameters >/dev/null 2>&1 &
     rc=$?
     
     if [ $rc != 0 ]; then
 	ocf_log err "MySQL start command failed: $rc"
   	return $rc
     fi
     
     # Spin waiting for the server to come up.
     # Let the CRM/LRM time us out if required
     start_wait=1
     while [ $start_wait = 1 ]; do
 	mysql_status
 	rc=$?
 	if [ $rc = $OCF_SUCCESS ]; then
 	    start_wait=0
 
 	elif [ $rc != $OCF_NOT_RUNNING ]; then
 	    ocf_log info "MySQL start failed: $rc"
 	    return $rc
 	fi
         sleep 2
     done
     
     ocf_log info "MySQL started"
     return $OCF_SUCCESS
 }
 
 mysql_stop() {
     if [ ! -f $OCF_RESKEY_pid ]; then
         return $OCF_SUCCESS
     fi
 
     pid=`cat $OCF_RESKEY_pid 2> /dev/null `
     /bin/kill $pid > /dev/null 2>&1
     rc=$?
     if [ $rc != 0 ]; then
         ocf_log err "MySQL couldn't be stopped"
 	return $OCF_ERR_GENERIC
     fi
 
     stop_wait=1
     while [ $stop_wait = 1 ]; do
 	mysql_status
 	rc=$?
 	if [ $rc = $OCF_NOT_RUNNING ]; then
 	    stop_wait=0
 	fi
         sleep 1
     done
 
     ocf_log info "MySQL stopped";
     rm -f /var/lock/subsys/mysqld
-    rm -f $OCF_RESKEY_datadir/mysql.sock
+    rm -f $OCF_RESKEY_socket
     return $OCF_SUCCESS
 }
 
 case "$1" in
   meta-data)	meta_data
 		exit $OCF_SUCCESS;;
   usage|help)	usage
 		exit $OCF_SUCCESS;;
 esac
 
 mysql_validate
 rc=$?
 LSB_STATUS_STOPPED=3
 if [ $rc -ne 0 ]; then
 	case "$1" in
 		stop) exit $OCF_SUCCESS;;
 		monitor) exit $OCF_NOT_RUNNING;;
 		status) exit $LSB_STATUS_STOPPED;;
 		*) exit $rc;;
 	esac
 fi
 
 # What kind of method was invoked?
 case "$1" in
   start)	mysql_start;;
   stop)		mysql_stop;;
   status)	mysql_status;;
   monitor)	mysql_monitor;;
   validate-all)	exit $OCF_SUCCESS;;
 
  *)		usage
 		exit $OCF_ERR_UNIMPLEMENTED;;
 esac