Merge branch 'usb-dev' into queued_work
diff --git a/cgminer.c b/cgminer.c
index 81e2eb1..8b06274 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -3010,6 +3010,8 @@ void __copy_work(struct work *work, struct work *base_work)
work->nonce2 = strdup(base_work->nonce2);
if (base_work->ntime)
work->ntime = strdup(base_work->ntime);
+ if (base_work->sessionid)
+ work->sessionid = strdup(base_work->sessionid);
if (base_work->gbt_coinbase)
work->gbt_coinbase = strdup(base_work->gbt_coinbase);
}
diff --git a/util.c b/util.c
index 902dd92..2e6c972 100644
--- a/util.c
+++ b/util.c
@@ -1517,7 +1517,7 @@ bool initiate_stratum(struct pool *pool)
if (pool->sessionid)
applog(LOG_DEBUG, "Pool %d stratum session id: %s", pool->pool_no, pool->sessionid);
else
- applog(LOG_DEBUG, "Pool %d stratum session id does not exist");
+ applog(LOG_DEBUG, "Pool %d stratum session id does not exist", pool->pool_no);
ret = true;
out: