Merge commit '7f46f6e' into cg_merges_20121231

miner.c

@@ -8177,7 +8177,7 @@ begin_bench:
 		pool = select_pool(lagging);
 retry:
 		if (pool->has_stratum) {
-			while (!pool->stratum_active) {
+			while (!pool->stratum_active || !pool->stratum_notify) {
 				struct pool *altpool = select_pool(true);
 
 				if (altpool == pool && pool->has_stratum)

util.c

@@ -1427,9 +1427,6 @@ bool auth_stratum(struct pool *pool)
 		goto out;
 	}
 
-	if (!pool->stratum_notify)
-		goto out;
-
 	ret = true;
 	applog(LOG_INFO, "Stratum authorisation success for pool %d", pool->pool_no);
 	pool->probed = true;