Merge branch 'master' into userstats

Conflicts:
	src/stratifier.c

src/libckpool.h

@@ -279,13 +279,13 @@ typedef struct proc_instance proc_instance_t;
 
 
 void _json_check(json_t *val, json_error_t *err, const char *file, const char *func, const int line);
-#define json_check(val, err) _json_check(val, err,  __FILE__, __func__, __LINE__)
+#define json_check(VAL, ERR) _json_check(VAL, ERR,  __FILE__, __func__, __LINE__)
 
 /* Check and pack json */
-#define JSON_CPACK(val, ...) do { \
-	json_error_t err; \
-	val = json_pack_ex(&err, 0, ##__VA_ARGS__); \
-	json_check(val, &err); \
+#define JSON_CPACK(VAL, ...) do { \
+	json_error_t ERR; \
+	VAL = json_pack_ex(&ERR, 0, ##__VA_ARGS__); \
+	json_check(VAL, &ERR); \
 } while (0)
 
 /* No error checking with these, make sure we know they're valid already! */

src/stratifier.c

@@ -2646,19 +2646,20 @@ out:
 	}
 
 	if (!share) {
-		JSON_CPACK(val, "{sI,ss,ss,sI,ss,ss,so,si,ss,ss,ss,ss}",
-				"clientid", client->id,
-				"secondaryuserid", user_instance->secondaryuserid,
-				"enonce1", client->enonce1,
-				"workinfoid", sdata->current_workbase->id,
-				"workername", client->workername,
-				"username", user_instance->username,
-				"error", json_copy(*err_val),
-				"errn", err,
-				"createdate", cdfield,
-				"createby", "code",
-				"createcode", __func__,
-				"createinet", ckp->serverurl[client->server]);
+		val = json_object();
+		json_set_int(val, "clientid", client->id);
+		if (!CKP_STANDALONE(ckp))
+			json_set_string(val, "secondaryuserid", user_instance->secondaryuserid);
+		json_set_string(val, "enonce1", client->enonce1);
+		json_set_int(val, "workinfoid", sdata->current_workbase->id);
+		json_set_string(val, "workername", client->workername);
+		json_set_string(val, "username", user_instance->username);
+		json_object_set(val, "error", *err_val);
+		json_set_int(val, "errn", err);
+		json_set_string(val, "createdate", cdfield);
+		json_set_string(val, "createby", "code");
+		json_set_string(val, "createcode", __func__);
+		json_set_string(val, "createinet", ckp->serverurl[client->server]);
 		ckdbq_add(ckp, ID_SHAREERR, val);
 		LOGINFO("Invalid share from client %ld: %s", client->id, client->workername);
 	}