From: Maria Matejka Date: Thu, 28 Nov 2024 11:23:14 +0000 (+0100) Subject: Merge commit '8dc2a36a' into thread-merge-2.16 X-Git-Tag: v3.0.0~56 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0dfd4dc3b36bca10f23cd9320a96d284a1f9221;p=thirdparty%2Fbird.git Merge commit '8dc2a36a' into thread-merge-2.16 --- c0dfd4dc3b36bca10f23cd9320a96d284a1f9221 diff --cc proto/rpki/tcp_transport.c index ebb8030fe,87451c94e..da0a5927b --- a/proto/rpki/tcp_transport.c +++ b/proto/rpki/tcp_transport.c @@@ -28,7 -31,10 +31,10 @@@ rpki_tr_tcp_open(struct rpki_tr_sock *t sk->type = SK_TCP_ACTIVE; + if (tcp_cf->auth_type == RPKI_TCP_AUTH_MD5) + sk->password = tcp_cf->password; + - if (sk_open(sk) != 0) + if (sk_open(sk, tr->cache->p->p.loop) != 0) return RPKI_TR_ERROR; return RPKI_TR_SUCCESS;