aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers/smtp
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2000-05-12 04:11:07 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2000-05-12 04:11:07 +0800
commit1e54cba4d328f71b7d1e3d7dfc0b8b95344a4d01 (patch)
treebc4cdf8ce252b90f7543fd867e0704caef5f1b1d /camel/providers/smtp
parent76715cfdda03f42433e3afaa6550f16c24b44815 (diff)
downloadgsoc2013-evolution-1e54cba4d328f71b7d1e3d7dfc0b8b95344a4d01.tar.gz
gsoc2013-evolution-1e54cba4d328f71b7d1e3d7dfc0b8b95344a4d01.tar.zst
gsoc2013-evolution-1e54cba4d328f71b7d1e3d7dfc0b8b95344a4d01.zip
providers/smtp/camel-smtp-transport.c: updated smtp_helo to more closely comply with RFC 821 standards
svn path=/trunk/; revision=2991
Diffstat (limited to 'camel/providers/smtp')
-rw-r--r--camel/providers/smtp/camel-smtp-transport.c24
1 files changed, 10 insertions, 14 deletions
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 57d14d7fe3..e76815a795 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -436,24 +436,20 @@ smtp_helo (CamelSmtpTransport *transport, CamelException *ex)
{
/* say hello to the server */
gchar *cmdbuf, *respbuf = NULL;
- gchar localhost[MAXHOSTNAMELEN + MAXHOSTNAMELEN + 2];
- gchar domainname[MAXHOSTNAMELEN];
-
- /* get the localhost name */
- memset(localhost, 0, sizeof(localhost));
- gethostname (localhost, MAXHOSTNAMELEN);
- memset(domainname, 0, sizeof(domainname));
- getdomainname(domainname, MAXHOSTNAMELEN);
- if (*domainname && strcmp(domainname, "(none)")) {
- strcat(localhost, ".");
- strcat(localhost, domainname);
- }
+ struct sockaddr_in localaddr;
+ guint32 addrlen;
+ struct hostent *host;
+
+ /* get the local host name */
+ addrlen = sizeof(localaddr);
+ getsockname(sock, (struct sockaddr*)&localaddr, &addrlen);
+ host = gethostbyaddr((gchar *)&localaddr.sin_addr, sizeof(localaddr.sin_addr), AF_INET);
/* hiya server! how are you today? */
if (smtp_is_esmtp)
- cmdbuf = g_strdup_printf ("EHLO %s\r\n", localhost);
+ cmdbuf = g_strdup_printf ("EHLO %s\r\n", host->h_name);
else
- cmdbuf = g_strdup_printf ("HELO %s\r\n", localhost);
+ cmdbuf = g_strdup_printf ("HELO %s\r\n", host->h_name);
if ( camel_stream_write (transport->ostream, cmdbuf, strlen(cmdbuf), ex) == -1) {
g_free(cmdbuf);
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,