[evolution-patches] EHLO empty-hostname-string patch

[Jeffrey Stedfast <fejj ximian com>]

Thought I fixed this a while back, but apparently never committed or
something.

anyways, this fixes a case where if host lookup fails and results in
host->h_name being an empty string rather than NULL (huh???), we default
back to using the IP address form.

2 users have reported this now, the first user (which is when I
originally fixed this) reported to me later that he discovered that it
was a network setup problem on his end. anyways, don't know the details
but this is easy to work around anyway, so figured I might as well.

Jeff

-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com

? 42295.patch
? ChangeLog.nonximian
? body
? body.c
? body.txt
? camel-mime-filter-windows.c
? camel-mime-filter-windows.h
? charset-map.c
? charset-map.diff
? cmsutil.c
? date.patch
? debug.patch
? ehlo.patch
? evolution-1.3-gpg.patch
? folder-info-build.patch
? foo
? gpg-verify.patch
? gpg.patch
? html-filter-broken.msg
? imap
? invalid-content-id.patch
? iso
? iso.c
? pop3-uidl.patch
? smime
? win-charset.patch
? tests/mime-filter/test-tohtml
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
retrieving revision 1.1809
diff -u -r1.1809 ChangeLog
--- ChangeLog	4 May 2003 19:11:39 -0000	1.1809
+++ ChangeLog	12 May 2003 18:54:05 -0000
@@ -1,3 +1,9 @@
+2003-05-12  Jeffrey Stedfast  <fejj ximian com>
+
+	* providers/smtp/camel-smtp-transport.c (smtp_helo): If
+	host->h_name is NULL or an empty string, default back to using the
+	IP address rather than the hostname in the EHLO command.
+
 2003-05-02  Dan Winship  <danw ximian com>
 
 	* camel-mime-part-utils.c
Index: providers/smtp/camel-smtp-transport.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/smtp/camel-smtp-transport.c,v
retrieving revision 1.136
diff -u -r1.136 camel-smtp-transport.c
--- providers/smtp/camel-smtp-transport.c	24 Apr 2003 01:51:20 -0000	1.136
+++ providers/smtp/camel-smtp-transport.c	12 May 2003 18:54:07 -0000
@@ -891,10 +891,8 @@
 	
 	camel_exception_clear (&err);
 	
-	if (host) {
-		if (host->h_name && *host->h_name)
-			name = g_strdup (host->h_name);
-		camel_free_host (host);
+	if (host && host->h_name && *host->h_name) {
+		name = g_strdup (host->h_name);
 	} else {
 #ifdef ENABLE_IPv6
 		char ip[MAXHOSTNAMELEN + 1];
@@ -911,7 +909,10 @@
 					transport->localaddr->address[3]);
 #endif
 	}
-		
+	
+	if (host)
+		camel_free_host (host);
+	
 	/* hiya server! how are you today? */
 	if (transport->flags & CAMEL_SMTP_TRANSPORT_IS_ESMTP)
 		cmdbuf = g_strdup_printf ("EHLO %s\r\n", name);