Changeset 216 for trunk

Timestamp:

Feb 18, 2009, 7:30:38 PM (16 years ago)

Author:

katerina

Message:

Fix ticket #138 (ability to specify SMTP port). Patch by lucas sizzo org.

Location:

trunk

Files:

• include/sh_mail.h (modified) (1 diff)
• src/sh_mail.c (modified) (3 diffs)
• src/sh_readconf.c (modified) (1 diff)

trunk/include/sh_mail.h

@@ -54 +54 @@
 int sh_mail_pushstack (int severity, const char * msg, const char * alias);
 
+/* Set the port to use (default 25)
+ */
+int sh_mail_set_port (const char * str);
+
 /* set sender of mail
  */
 int sh_mail_set_sender (const char *str);
 
-int sh_mail_add_or  (const char * str);
-int sh_mail_add_and (const char * str);
-int sh_mail_add_not (const char * str);
-
 #endif

trunk/src/sh_mail.c

@@ -916 +916 @@
 }
 
+static int sh_mail_port = IPPORT_SMTP;
+
+int sh_mail_set_port (const char * str)
+{
+  int i = atoi (str);
+  
+  SL_ENTER(_("sh_mail_set_port"));
+  
+  if (i >= 0 && i < 65535)
+    { 
+      sh_mail_port = i;
+    }
+  else
+    {
+      sh_mail_port = IPPORT_SMTP;
+      SL_RETURN ((-1), _("sh_mail_set_port"));
+    }
+  
+  SL_RETURN( (0), _("sh_mail_set_port"));
+}
 
 /*************************
@@ -1017 +1037 @@
       TPT((0, FIL__, __LINE__, _("msg=<user %s machine %s>\n"), 
            ma_user, ma_machine)); 
-      fd = connect_port (ma_machine, IPPORT_SMTP, 
+      fd = connect_port (ma_machine, sh_mail_port, 
                          error_call, &error_num, error_msg, 256);
     }
@@ -1040 +1060 @@
                    _("msg=<user %s mx %s pref %d>\n"), 
                    ma_user, ma_machine, result[i].pref));
-              fd = connect_port (ma_machine, IPPORT_SMTP, 
+              fd = connect_port (ma_machine, sh_mail_port, 
                                  error_call, &error_num, error_msg, 256);
               if (fd >= 0)

trunk/src/sh_readconf.c

@@ -1101 +1101 @@
   { N_("setmailrelay"),      SH_SECTION_MAIL,  SH_SECTION_MISC, 
     sh_mail_set_relay },
+  { N_("setmailport"),       SH_SECTION_MAIL,  SH_SECTION_MISC,
+    sh_mail_set_port },
   { N_("mailsingle"),        SH_SECTION_MAIL,  SH_SECTION_MISC, 
     sh_mail_setFlag },