diff options
Diffstat (limited to 'src/starter/starterstroke.c')
| -rw-r--r-- | src/starter/starterstroke.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c index 45d407384..7272b2530 100644 --- a/src/starter/starterstroke.c +++ b/src/starter/starterstroke.c @@ -118,7 +118,7 @@ static char* connection_name(starter_conn_t *conn) if (streq(conn->name, "%auto")) { - sprintf(buf, "conn_%ld", conn->id); + sprintf(buf, "conn_%lu", conn->id); return buf; } return conn->name; @@ -171,10 +171,7 @@ static void starter_stroke_add_end(stroke_msg_t *msg, stroke_end_t *msg_end, sta msg_end->id2 = push_string(msg, conn_end->id2); msg_end->cert = push_string(msg, conn_end->cert); msg_end->cert2 = push_string(msg, conn_end->cert2); -<<<<<<< HEAD -======= msg_end->cert_policy = push_string(msg, conn_end->cert_policy); ->>>>>>> upstream/4.5.1 msg_end->ca = push_string(msg, conn_end->ca); msg_end->ca2 = push_string(msg, conn_end->ca2); msg_end->groups = push_string(msg, conn_end->groups); @@ -270,10 +267,7 @@ int starter_stroke_add_conn(starter_config_t *cfg, starter_conn_t *conn) msg.add_conn.mark_in.mask = conn->mark_in.mask; msg.add_conn.mark_out.value = conn->mark_out.value; msg.add_conn.mark_out.mask = conn->mark_out.mask; -<<<<<<< HEAD -======= msg.add_conn.tfc = conn->tfc; ->>>>>>> upstream/4.5.1 starter_stroke_add_end(&msg, &msg.add_conn.me, &conn->left); starter_stroke_add_end(&msg, &msg.add_conn.other, &conn->right); |