masqmail
view src/timeival.c @ 246:4cff8638dd9b
SMTP client: tries EHLO now always first
Changed the behavior of the SMTP client. Now always an EHLO greeting
is sent, no matter what kind of greeting text the server had sent. If
the EHLO failed, an HELO greeting is tried as fall back. This is the
behavior RFC 2821 requires (section 3.2).
This change will fix setups that were not possible to sent to a
server because that requires AUTH but hadn't said ``ESMTP'' in its
greeting message.
See also: Debian bug #349211
Thanks to Steffen (inne)
author | markus schnalke <meillo@marmaro.de> |
---|---|
date | Thu, 28 Oct 2010 16:40:02 -0300 |
parents | 26e34ae9a3e3 |
children | 82d168dd52fd |
line source
1 /* MasqMail
2 Copyright (C) 1999-2002 Oliver Kurth
4 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by
6 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version.
9 This program is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 GNU General Public License for more details.
14 You should have received a copy of the GNU General Public License
15 along with this program; if not, write to the Free Software
16 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17 */
19 #include <ctype.h>
20 #include <glib.h>
22 #include "masqmail.h"
24 gint
25 time_interval(gchar * str, gint * pos)
26 {
27 gchar buf[16];
28 gchar *p = str, *q = buf;
29 gint factor = 1, val;
31 while (*p && isdigit(*p) && (q < buf + 15)) {
32 *(q++) = *(p++);
33 (*pos)++;
34 }
35 (*pos)++;
36 *q = '\0';
37 val = atoi(buf);
39 /* fall through: */
40 switch (*p) {
41 case 'w':
42 factor *= 7;
43 case 'd':
44 factor *= 24;
45 case 'h':
46 factor *= 60;
47 case 'm':
48 factor *= 60;
49 case 's':
50 break;
51 default:
52 return -1;
53 }
54 return val * factor;
55 }