From: Maria Matejka <mq@ucw.cz>
Date: Wed, 17 Dec 2025 13:31:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into thread-next
X-Git-Tag: v3.2.0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8413740372f93ea4d878b1fa29ab5af248be249f;p=thirdparty%2Fbird.git

Merge remote-tracking branch 'origin/master' into thread-next

There is a global check for pthreads and therefore BFD does not need to
check for pthreads anymore itself. Check dropped.
---

8413740372f93ea4d878b1fa29ab5af248be249f
diff --cc sysdep/unix/io.c
index 1f4eb619c,98345d58b..c319e9856
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@@ -1605,8 -1424,8 +1605,8 @@@ sk_ssh_connect(sock *s
  	server_identity_is_ok = 0;
  	break;
  
 -      case SSH_SERVER_FOUND_OTHER:
 +      case SSH_KNOWN_HOSTS_OTHER:
- 	LOG_WARN_ABOUT_SSH_SERVER_VALIDATION(s, "The server gave use a key of a type while we had another type recorded. " \
+ 	LOG_WARN_ABOUT_SSH_SERVER_VALIDATION(s, "The server gave use a key of a different type than we have recorded. " \
  					     "It is a possible attack.");
  	server_identity_is_ok = 0;
  	break;