Don't use getdomainname: it's NIS crap, not DNS.

	* camel-mime-utils.c (header_msgid_generate): Don't use
	getdomainname: it's NIS crap, not DNS.

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 9074e6d..5ac066c 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-16  Dan Winship  <danw@ximian.com>
+
+       * camel-mime-utils.c (header_msgid_generate): Don't use
+       getdomainname: it's NIS crap, not DNS.
+
 2001-03-15  Jeffrey Stedfast  <fejj@ximian.com>
 
        * camel.c (camel_init): Don't use the hardcoded cert db directory,

diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index b2abb59..edec357 100644 (file)
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -2935,7 +2935,7 @@ header_raw_clear(struct _header_raw **list)
 char *
 header_msgid_generate (void)
 {
-       char host[MAXHOSTNAMELEN], domain[MAXHOSTNAMELEN];
+       char host[MAXHOSTNAMELEN];
 #ifdef ENABLE_THREADS
        static pthread_mutex_t count_lock = PTHREAD_MUTEX_INITIALIZER;
 #define COUNT_LOCK() pthread_mutex_lock (&count_lock)
@@ -2945,16 +2945,14 @@ header_msgid_generate (void)
 #define COUNT_UNLOCK()
 #endif /* ENABLE_THREADS */
        static gint count = 0;
-       gint hrv, drv;
+       gint hrv;
        char *ret;
        
        hrv = gethostname (host, sizeof (host));
-       drv = getdomainname (domain, sizeof (domain));
        
        COUNT_LOCK ();
-       ret = g_strdup_printf ("%d.%d.%d.camel@%s.%s", (gint) time (NULL), getpid (), count++,
-                              (hrv == 0 && host && *host) ? host : "unknown.host",
-                              (drv && domain && *domain) ? domain : "unknown.domain");
+       ret = g_strdup_printf ("%d.%d.%d.camel@%s", (gint) time (NULL), getpid (), count++,
+                              (hrv == 0 && host && *host) ? host : "unknown.host");
        COUNT_UNLOCK ();
        
        return ret;