chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/keyexch.c: Pass correct peer pointer when reporting group mismatch.
[tripe]
/
server
/
keyexch.c
diff --git
a/server/keyexch.c
b/server/keyexch.c
index 2502fa398d797578378448df7578914710d4f034..8cc4ad6953abdaa46ff44ea36cb61e129225676b 100644
(file)
--- a/
server/keyexch.c
+++ b/
server/keyexch.c
@@
-1480,7
+1480,7
@@
int kx_init(keyexch *kx, peer *p, keyset **ks, unsigned f)
if ((kx->kpriv = km_findpriv(p_privtag(p))) == 0) goto fail_0;
if ((kx->kpub = km_findpub(p_tag(p))) == 0) goto fail_1;
if (!group_samep(kx->kpriv->g, kx->kpub->g)) {
if ((kx->kpriv = km_findpriv(p_privtag(p))) == 0) goto fail_0;
if ((kx->kpub = km_findpub(p_tag(p))) == 0) goto fail_1;
if (!group_samep(kx->kpriv->g, kx->kpub->g)) {
- a_warn("KX", "?PEER",
kx->
p, "group-mismatch",
+ a_warn("KX", "?PEER", p, "group-mismatch",
"local-private-key", "%s", p_privtag(p),
"peer-public-key", "%s", p_tag(p),
A_END);
"local-private-key", "%s", p_privtag(p),
"peer-public-key", "%s", p_tag(p),
A_END);