Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bugs in {G,}CBREG.
[doldaconnect.git]
/
daemon
/
ui.c
diff --git
a/daemon/ui.c
b/daemon/ui.c
index
df421ec
..
5152808
100644
(file)
--- a/
daemon/ui.c
+++ b/
daemon/ui.c
@@
-590,7
+590,7
@@
static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc
args = NULL;
for(i = 3; i < argc - 1; i += 2)
newwcspair(argv[i], argv[i + 1], &args);
args = NULL;
for(i = 3; i < argc - 1; i += 2)
newwcspair(argv[i], argv[i + 1], &args);
- fn = fnetinitconnect(argv[1], buf, args);
+ fn = fnetinitconnect(argv[1],
data->userinfo->name,
buf, args);
err = errno;
free(buf);
if(fn == NULL)
err = errno;
free(buf);
if(fn == NULL)
@@
-641,6
+641,11
@@
static void cmd_disconnect(struct socket *sk, struct uidata *data, int argc, wch
sq(sk, 0, L"510", L"No such node", NULL);
return;
}
sq(sk, 0, L"510", L"No such node", NULL);
return;
}
+ if(wpfind(fn->args, L"locked") && !((data->userinfo->perms & PERM_ADMIN) || !wcscmp(data->userinfo->name, fn->owner)))
+ {
+ sq(sk, 0, L"502", L"This node is locked and you are neither administrator nor its owner", NULL);
+ return;
+ }
killfnetnode(fn);
unlinkfnetnode(fn);
}
killfnetnode(fn);
unlinkfnetnode(fn);
}
@@
-686,7
+691,7
@@
static void cmd_lspeers(struct socket *sk, struct uidata *data, int argc, wchar_
} else {
for(peer = fn->peers; peer != NULL; peer = peer->next)
{
} else {
for(peer = fn->peers; peer != NULL; peer = peer->next)
{
- sq(sk, 2 | ((peer->next != NULL)?1:0), L"200",
peer->id
, peer->nick, NULL);
+ sq(sk, 2 | ((peer->next != NULL)?1:0), L"200",
L"%%s", peer->id, L"%%s"
, peer->nick, NULL);
for(i = 0; i < peer->dinum; i++)
{
if(peer->peerdi[i].datum->datatype == FNPD_INT)
for(i = 0; i < peer->dinum; i++)
{
if(peer->peerdi[i].datum->datatype == FNPD_INT)
@@
-699,7
+704,7
@@
static void cmd_lspeers(struct socket *sk, struct uidata *data, int argc, wchar_
sq(sk, 2, peer->peerdi[i].datum->id, buf, NULL);
}
if((peer->peerdi[i].datum->datatype == FNPD_STR) && (peer->peerdi[i].data.str != NULL))
sq(sk, 2, peer->peerdi[i].datum->id, buf, NULL);
}
if((peer->peerdi[i].datum->datatype == FNPD_STR) && (peer->peerdi[i].data.str != NULL))
- sq(sk, 2, peer->peerdi[i].datum->id, peer->peerdi[i].data.str, NULL);
+ sq(sk, 2, peer->peerdi[i].datum->id,
L"%%s",
peer->peerdi[i].data.str, NULL);
}
sq(sk, 0, NULL);
}
}
sq(sk, 0, NULL);
}