** See bug #47821.

2004-09-13  Not Zed  <NotZed@Ximian.com>

        ** See bug #47821.

        * camel-service.c: removed the old hostent based hostname interfaces.

        * camel-sasl-kerberos4.c (krb4_challenge): new hostname interfaces.

        * camel-sasl-gssapi.c (gssapi_challenge): new hostname interfaces.

        * camel-sasl-digest-md5.c (digest_md5_challenge): use new hostname
        interfaces.
        (generate_response): just take hostname directly, not hostent.

        * camel-mime-utils.c (camel_header_msgid_generate): use new
        hostname interfaces.

        * providers/smtp/camel-smtp-transport.c (connect_to_server): fixed
        to use new addrinfo apis.

        * providers/pop3/camel-pop3-store.c (connect_to_server): fixed to
        use new addrinfo apis.

        * camel-tcp-stream-ssl.c (stream_connect): try all addresses
        supplied.

        * camel-tcp-stream.c (camel_tcp_stream_get_remote_address)
        (camel_tcp_stream_get_local_address): return a sockaddr now, and
        also the address length.  Fixed all implementations and callers.
        (camel_tcp_stream_connect): use addrinfo rather than hostent for
        host AND port info.  Fixed all implementations and callers.

svn path=/trunk/; revision=27352

1 files changed, 15 insertions, 11 deletions

diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index 8ce61e0b4e..3c1d4baf1c 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -3761,25 +3761,29 @@ camel_header_msgid_generate (void)
 #define COUNT_LOCK() pthread_mutex_lock (&count_lock)
 #define COUNT_UNLOCK() pthread_mutex_unlock (&count_lock)
 	char host[MAXHOSTNAMELEN];
-	struct hostent *h = NULL;
+	char *name;
 	static int count = 0;
 	char *msgid;
 	int retval;
-	
+	struct addrinfo *ai = NULL, hints = { 0 };
+
 	retval = gethostname (host, sizeof (host));
-	
-	if (retval == 0 && *host)
-		h = camel_gethostbyname (host, NULL);
-	else
-		host[0] = '\0';
+	if (retval == 0 && *host) {
+		hints.ai_flags = AI_CANONNAME;
+		ai = camel_getaddrinfo(host, NULL, &hints, NULL);
+		if (ai && ai->ai_canonname)
+			name = ai->ai_canonname;
+		else
+			name = host;
+	} else
+		name = "localhost.localdomain";
 	
 	COUNT_LOCK ();
-	msgid = g_strdup_printf ("%d.%d.%d.camel@%s", (int) time (NULL), getpid (), count++,
-				 h ? h->h_name : (*host ? host : "localhost.localdomain"));
+	msgid = g_strdup_printf ("%d.%d.%d.camel@%s", (int) time (NULL), getpid (), count++, name);
 	COUNT_UNLOCK ();
 	
-	if (h)
-		camel_free_host (h);
+	if (ai)
+		camel_freeaddrinfo(ai);
 	
 	return msgid;
 }