Merge pull request #2717 from kgaillot/fixes

Minor clean-up before 2.1.3 release

cts/lab/cts.in

@@ -155,7 +155,7 @@ while true; do
 	    for f in $files; do
 		rm -f $cts_root/$f
 		echo "Downloading helper script $f from GitHub"
-		wget -O "$cts_root/$f" "$(REPO)/$f"
+		wget -O "$cts_root/$f" "${REPO}/$f"
 		chmod +x $cts_root/$f
 	    done
 	    shift
@@ -171,14 +171,14 @@ export PATH="$PATH:$cts_root"
 which cluster-helper &>/dev/null
 if [ $? != 0 ]; then
     echo $0 needs the cluster-helper script to be in your path
-    echo "You can obtain it from: $(REPO)/cluster-helper"
+    echo "You can obtain it from: ${REPO}/cluster-helper"
     exit 1
 fi
 
 which cluster-clean &>/dev/null
 if [ $? != 0 ]; then
     echo $0 needs the cluster-clean script to be in your path
-    echo "You can obtain it from: $(REPO)/cluster-clean"
+    echo "You can obtain it from: ${REPO}/cluster-clean"
     exit 1
 fi
 

lib/common/mainloop.c

@@ -703,6 +703,7 @@ mainloop_add_ipc_server_with_prio(const char *name, enum qb_ipc_type type,
     rc = qb_ipcs_run(server);
     if (rc < 0) {
         crm_err("Could not start %s IPC server: %s (%d)", name, pcmk_strerror(rc), rc);
+        qb_ipcs_destroy(server);
         return NULL;
     }