DGNum/rpcd
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

debug

Browse source
This commit is contained in:
Jo-Philipp Wich 2014-01-12 17:33:46 +00:00
parent 7cac6af5ed
commit b0254d1203
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
uci.c
View file

@ -1392,6 +1392,10 @@ rpc_uci_apply(struct ubus_context *ctx, struct ubus_object *obj,
return ret;
}
/* copy SID early because rpc_uci_apply_config() will clobber buf */
if (rollback)
strncpy(apply_sid, sid, RPC_SID_LEN);
for (i = 0; i < gl.gl_pathc; i++) {
char *config = basename(gl.gl_pathv[i]);
struct stat s;
@ -1410,7 +1414,6 @@ rpc_uci_apply(struct ubus_context *ctx, struct ubus_object *obj,
globfree(&gl);
if (rollback) {
strncpy(apply_sid, sid, RPC_SID_LEN);
apply_timer.cb = rpc_uci_apply_timeout;
uloop_timeout_set(&apply_timer, timeout * 1000);
apply_ctx = ctx;
@ -1439,6 +1442,8 @@ rpc_uci_confirm(struct ubus_context *ctx, struct ubus_object *obj,
if (!apply_sid[0])
return UBUS_STATUS_NO_DATA;
printf("CMP=%s/%s\n", apply_sid, sid);
if (strcmp(apply_sid, sid))
return UBUS_STATUS_PERMISSION_DENIED;