From: Maria Matejka <mq@ucw.cz>
Date: Fri, 13 Dec 2024 15:01:19 +0000 (+0100)
Subject: Merge commit 'ef456118' into thread-next
X-Git-Tag: v3.0.0~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6f6ab0e5dfaf2ed8c7f7b3cd9dd4f0efcaaf61d;p=thirdparty%2Fbird.git

Merge commit 'ef456118' into thread-next
---

b6f6ab0e5dfaf2ed8c7f7b3cd9dd4f0efcaaf61d
diff --cc proto/rpki/packets.c
index 4cd10773c,bbef16ef5..15ab47220
--- a/proto/rpki/packets.c
+++ b/proto/rpki/packets.c
@@@ -1135,7 -1162,7 +1156,7 @@@ rpki_connected_hook(sock *sk
   * This function prepares Error PDU and sends it to a cache server.
   */
  static int
- rpki_send_error_pdu_(struct rpki_cache *cache, const enum pdu_error_type error_code, const u32 err_pdu_len, const struct pdu_header *erroneous_pdu, const char *fmt, ...)
 -rpki_send_error_pdu(struct rpki_cache *cache, const enum pdu_error_type error_code, u32 err_pdu_len, const struct pdu_header *erroneous_pdu, const char *fmt, ...)
++rpki_send_error_pdu_(struct rpki_cache *cache, const enum pdu_error_type error_code, u32 err_pdu_len, const struct pdu_header *erroneous_pdu, const char *fmt, ...)
  {
    va_list args;
    char msg[128];