Merge pull request Alinto#62 from the-nic/fix-5654

fix(smtp): Format ipv6 correctly for SMTP EHLO
OpenGroupware · Dec 8, 2022 · 41a0fc7 · 41a0fc7
2 parents bd7d986 + 5f9cb49
commit 41a0fc7
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/sope-mime/NGMail/NGSmtpClient.m b/sope-mime/NGMail/NGSmtpClient.m
@@ -511,14 +511,21 @@ - (void)_fetchExtensionInfo {
   NGSmtpResponse *reply = nil;
   NSString       *hostName = nil;
   NGActiveSocket* sock;
+  NGInternetSocketAddress* sockAddr;
 
   if (previous_socket) {
     sock = self->previous_socket;
   } else {
     sock = self->socket;
   }
 
-  hostName = [(NGInternetSocketAddress *)[sock localAddress] hostName];
+  sockAddr = (NGInternetSocketAddress *)[sock localAddress];
+  if ([sockAddr isIPv6] && [[sockAddr hostName] isEqualToString: [sockAddr address]]) {
+    hostName = [NSString stringWithFormat:@"[IPv6:%@]", [sockAddr address]];
+  }
+  else {
+    hostName = [sockAddr hostName];
+  }
 
   reply = [self sendCommand:@"EHLO" argument:hostName];
   if ([reply code] == NGSmtpActionCompleted) {