Browse Source

ckdb - workers_update handle no change, merklehash allow zero length

master
kanoi 11 years ago
parent
commit
9279c6843e
  1. 14
      src/ckdb.c

14
src/ckdb.c

@ -1884,10 +1884,12 @@ static bool workers_update(PGconn *conn, K_ITEM *item, char *difficultydefault,
HISTORYDATEINIT(row, now, by, code, inet); HISTORYDATEINIT(row, now, by, code, inet);
if (diffdef != row->difficultydefault || if (diffdef == row->difficultydefault &&
idlenot != row->idlenotificationenabled[0] || idlenot == row->idlenotificationenabled[0] &&
nottime != row->idlenotificationtime) { nottime == row->idlenotificationtime) {
ok = true;
goto early;
} else {
upd = "update workers set expirydate=$1 where workerid=$2 and expirydate=$3"; upd = "update workers set expirydate=$1 where workerid=$2 and expirydate=$3";
par = 0; par = 0;
params[par++] = tv_to_buf(now, NULL, 0); params[par++] = tv_to_buf(now, NULL, 0);
@ -1953,7 +1955,7 @@ unparam:
PQclear(res); PQclear(res);
for (n = 0; n < par; n++) for (n = 0; n < par; n++)
free(params[n]); free(params[n]);
early:
return ok; return ok;
} }
@ -4210,7 +4212,7 @@ static char *cmd_sharelog(char *cmd, char *id, tv_t *now, char *by, char *code,
if (!i_transactiontree) if (!i_transactiontree)
return strdup(reply); return strdup(reply);
i_merklehash = require_name("merklehash", 1, NULL, reply, siz); i_merklehash = require_name("merklehash", 0, NULL, reply, siz);
if (!i_merklehash) if (!i_merklehash)
return strdup(reply); return strdup(reply);

Loading…
Cancel
Save