diff -U2 -r /var/lib/copr-rpmbuild/results/i2pd-git/upstream-unpacked/Source0/i2pd-openssl/libi2pd_client/AddressBook.cpp /var/lib/copr-rpmbuild/results/i2pd-git/srpm-unpacked/i2pd-openssl.tar.gz-extract/i2pd-openssl/libi2pd_client/AddressBook.cpp
--- /var/lib/copr-rpmbuild/results/i2pd-git/upstream-unpacked/Source0/i2pd-openssl/libi2pd_client/AddressBook.cpp	2026-10-14 01:56:02.000000000 +0000
+++ /var/lib/copr-rpmbuild/results/i2pd-git/srpm-unpacked/i2pd-openssl.tar.gz-extract/i2pd-openssl/libi2pd_client/AddressBook.cpp	2026-10-14 01:45:47.000000000 +0000
@@ -614,5 +614,9 @@
 				if (pos != addr.npos)
 					addr = addr.substr(0, pos); // remove comments
+#if __cplusplus >= 202002L // C++20
 				if (name.ends_with (".b32.i2p"))
+#else
+				if (name.find(".b32.i2p") != name.npos)
+#endif
 				{
 					LogPrint (eLogError, "Addressbook: Skipped adding of b32 address: ", name);
@@ -620,5 +624,9 @@
 				}
 
+#if __cplusplus >= 202002L // C++20
 				if (!name.ends_with (".i2p"))
+#else
+				if (name.find(".i2p") == name.npos)
+#endif
 				{
 					LogPrint (eLogError, "Addressbook: Malformed domain: ", name);
@@ -640,4 +648,5 @@
 						ident->GetSigningKeyType () != i2p::data::SIGNING_KEY_TYPE_DSA_SHA1) // don't replace by DSA
 					{
+						it->second->identHash = ident->GetIdentHash ();
 						if (m_Storage)
 						{
@@ -645,5 +654,4 @@
 							m_Storage->RemoveAddress (it->second->identHash);
 						}
-						it->second->identHash = ident->GetIdentHash ();
 						LogPrint (eLogInfo, "Addressbook: Updated host: ", name);
 					}