Merge branch 'master' into 1.1

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index cf6b26f..8d4dfb9 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -401,7 +401,7 @@ static void send_everything(connection_t *c) {
 
 bool ack_h(connection_t *c, char *request) {
        char hisport[MAX_STRING_SIZE];
-       char *hisaddress, *dummy;
+       char *hisaddress;
        int weight, mtu;
        uint32_t options;
        node_t *n;
@@ -479,10 +479,9 @@ bool ack_h(connection_t *c, char *request) {
        c->edge = new_edge();
        c->edge->from = myself;
        c->edge->to = n;
-       sockaddr2str(&c->address, &hisaddress, &dummy);
+       sockaddr2str(&c->address, &hisaddress, NULL);
        c->edge->address = str2sockaddr(hisaddress, hisport);
        free(hisaddress);
-       free(dummy);
        c->edge->weight = (weight + c->estimated_weight) / 2;
        c->edge->connection = c;
        c->edge->options = c->options;