Merge commit '289d680' into cg_merges_20121203

miner.c

@@ -5461,12 +5461,10 @@ static bool cnx_needed(struct pool *pool)
 		return true;
 	if (pool_strategy == POOL_LOADBALANCE)
 		return true;
-	if (opt_fail_only)
-		return true;
 	cp = current_pool();
 	if (cp == pool)
 		return true;
-	if (!cp->has_gbt && !cp->has_stratum)
+	if (!cp->has_gbt && !cp->has_stratum && !opt_fail_only)
 		return true;
 	return false;
 }