[idms-dbma-devel]commit - r41 - trunk/modules/protocols/smtp

[<idm...@li...>]

Author: nkukard
Date: 2004-10-17 14:13:09 +0200 (Sun, 17 Oct 2004)
New Revision: 41

Modified:
   trunk/modules/protocols/smtp/smtp.c
   trunk/modules/protocols/smtp/smtp_cmd_ehlo.c
   trunk/modules/protocols/smtp/smtp_cmd_helo.c
Log:
* Finished off ehlo & helo basic commands


Modified: trunk/modules/protocols/smtp/smtp.c
===================================================================
--- trunk/modules/protocols/smtp/smtp.c	2004-10-15 17:24:35 UTC (rev 40)
+++ trunk/modules/protocols/smtp/smtp.c	2004-10-17 12:13:09 UTC (rev 41)
@@ -86,6 +86,7 @@
 	/* Protocol specific */
 	data->mode = SMTP_MODE_NONE;
 	data->myHostname = "fully.qualified.domain.com";
+	data->helloDomain = NULL;
 	
 	data->tmpBufSize = SMTP_RESP_LEN;
 	data->tmpBuf = malloc(data->tmpBufSize);
@@ -200,6 +201,12 @@
 	struct smtp_data_t *data = connection->data;
 
 
+	/* myHostname is just a link to a char *, DO NOT FREE!!! */
+
+	/* Free stuff we allocated */
+	if (data->helloDomain)
+		free(data->helloDomain);
+	
 	free(data->tmpBuf);
 	free(data);
 	

Modified: trunk/modules/protocols/smtp/smtp_cmd_ehlo.c
===================================================================
--- trunk/modules/protocols/smtp/smtp_cmd_ehlo.c	2004-10-15 17:24:35 UTC (rev 40)
+++ trunk/modules/protocols/smtp/smtp_cmd_ehlo.c	2004-10-17 12:13:09 UTC (rev 41)
@@ -55,12 +55,14 @@
 		return SMTP_ERROR_FATAL;
 	}
 
-	cmdState->cur = (char **) smtp_capabilities;
+	/* Pull params out */	
+	data->helloDomain = strdup(TEXT_PARAM(0));
 
+	/* We support extensions */
 	snprintf(data->tmpBuf,data->tmpBufSize,"250-%s" EOL,data->myHostname);
-
-	/* We support extensions */
 	data->mode = SMTP_MODE_ESMTP;
+	
+	cmdState->cur = (char **) smtp_capabilities;
 
 	/* Keep cmdState up to date */
 	data->cmdHandle = cmdState;

Modified: trunk/modules/protocols/smtp/smtp_cmd_helo.c
===================================================================
--- trunk/modules/protocols/smtp/smtp_cmd_helo.c	2004-10-15 17:24:35 UTC (rev 40)
+++ trunk/modules/protocols/smtp/smtp_cmd_helo.c	2004-10-17 12:13:09 UTC (rev 41)
@@ -41,7 +41,7 @@
 	}
 			
 	/* Pull params out */	
-	data->helloDomain = TEXT_PARAM(0);
+	data->helloDomain = strdup(TEXT_PARAM(0));
 
 	/* No real hard work here */
 	snprintf(data->tmpBuf,data->tmpBufSize,"250 %s" EOL,data->myHostname);