Merge lp:~gandelman-a/ubuntu/lucid/cluster-agents/lp893352 into lp:ubuntu/lucid/cluster-agents

[Adam Gandelman]

Proposed SRU for bug 893352

[James Page (james-page)]

LGTM

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-03-30 06:57:42 +0000
+++ .pc/applied-patches	2011-11-22 20:57:27 +0000
@@ -1,1 +1,2 @@
 spelling-fixes.patch
+mysql_move_writable_test.patch

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-26 12:30:52 +0000
+++ debian/changelog	2011-11-22 20:57:27 +0000
@@ -1,3 +1,11 @@
+cluster-agents (1:1.0.3-2ubuntu1.1) lucid-proposed; urgency=low
+
+  * debian/patches/mysql_move_writable_test.patch: Cherry-pick upstream
+    commit (95a6eb8a).  In mysql OCF, properly create $pid_dir before testing
+    permissions on it. (LP: #893352)
+
+ -- Adam Gandelman <[e-mail]>  Tue, 22 Nov 2011 11:20:06 -0800
+
 cluster-agents (1:1.0.3-2ubuntu1) lucid; urgency=low
 
   * Merge from debian unstable

=== added file 'debian/patches/mysql_move_writable_test.patch'
--- debian/patches/mysql_move_writable_test.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/mysql_move_writable_test.patch	2011-11-22 20:57:27 +0000
@@ -0,0 +1,45 @@
+Author: Florian Haas <[e-mail]>
+Date:   Fri Jun 4 14:15:23 2010 +0200
+Origin: https://github.com/ClusterLabs/resource-agents/
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/893352
+Description: mysql: check for write permissions after creating pid and socket directory
+
+Stupidly, we'd previously check permissions on the pid directory before
+creating it. Move the permission check after directory creation, and
+also check the socket directory in the same manner.
+
+commit a1801207e0602d9b975f336569b562c195a6eb8a
+
+
+Index: cluster-agents/heartbeat/mysql
+===================================================================
+--- cluster-agents.orig/heartbeat/mysql	2011-11-22 10:40:46.480688355 -0800
++++ cluster-agents/heartbeat/mysql	2011-11-22 10:40:57.116687965 -0800
+@@ -342,10 +342,6 @@
+     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
+@@ -359,6 +355,16 @@
+ 	chown $OCF_RESKEY_user:$OCF_RESKEY_group $socket_dir
+     fi
+ 
++    # Regardless of whether we just created the directory or it
++    # already existed, check whether it is writable by the configured
++    # user
++    for dir in $pid_dir $socket_dir; do
++	if ! su -s /bin/sh - $OCF_RESKEY_user -c "test -w $dir"; then
++	    ocf_log err "Directory $dir is not writable by $OCF_RESKEY_user"
++	    exit $OCF_ERR_PERM;
++	fi
++    done
++
+     # Uncomment to perform permission clensing
+     # - not convinced this should be enabled by default
+     #

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-03-30 06:57:42 +0000
+++ debian/patches/series	2011-11-22 20:57:27 +0000
@@ -1,1 +1,2 @@
 spelling-fixes.patch
+mysql_move_writable_test.patch

=== modified file 'heartbeat/mysql'
--- heartbeat/mysql	2010-04-14 16:09:45 +0000
+++ heartbeat/mysql	2011-11-22 20:57:27 +0000
@@ -342,10 +342,6 @@
     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
@@ -359,6 +355,16 @@
 	chown $OCF_RESKEY_user:$OCF_RESKEY_group $socket_dir
     fi
 
+    # Regardless of whether we just created the directory or it
+    # already existed, check whether it is writable by the configured
+    # user
+    for dir in $pid_dir $socket_dir; do
+	if ! su -s /bin/sh - $OCF_RESKEY_user -c "test -w $dir"; then
+	    ocf_log err "Directory $dir is not writable by $OCF_RESKEY_user"
+	    exit $OCF_ERR_PERM;
+	fi
+    done
+
     # Uncomment to perform permission clensing
     # - not convinced this should be enabled by default
     #