diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | bootstrap | 3 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | gacopyz/gacopyz.c | 2 | ||||
| -rw-r--r-- | src/dnsbase.c | 3 | ||||
| -rw-r--r-- | src/mailfromd.h | 4 |
6 files changed, 20 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2008-02-06 Sergey Poznyakoff <gray@gnu.org.ua> + * src/dnsbase.c: Define MAX, if necessary. + * src/mailfromd.h: Define INADDR_NONE. + * configure.ac: Check for librt. + Add auth to AM_GNU_MAILUTILS. + * gacopyz/gacopyz.c (do_connect): Fix typo. + * bootstrap (MODLIST): Add vasprintf. + * configure.ac: Check for libsocket and libnsl. * src/dnsbase.c (dns_resolve_hostname,a_lookup): Change @@ -17,7 +17,8 @@ MODLIST="argp\ regex\ save-cwd\ snprintf\ - strtok_r" + strtok_r\ + vasprintf" MODAVOID="xalloc-die openat-die" diff --git a/configure.ac b/configure.ac index b2c49829..929d1bb0 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ AC_PREREQ(2.59) m4_define([MF_VERSION_MAJOR], 4) -m4_define([MF_VERSION_MINOR], 3) +m4_define([MF_VERSION_MINOR], 2) dnl m4_define([MF_VERSION_PATCH], 0) AC_INIT([mailfromd], MF_VERSION_MAJOR.MF_VERSION_MINOR[]m4_ifdef([MF_VERSION_PATCH],.MF_VERSION_PATCH), @@ -46,6 +46,7 @@ AC_PROG_LEX AC_CHECK_LIB(resolv, res_query) AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(nsl, gethostbyaddr) +AC_CHECK_LIB(rt, nanosleep) # Checks for header files. AC_HEADER_STDC @@ -87,7 +88,7 @@ extern char *strtok_r (char *s, const char *delim, char **save_ptr); ]) # Check for GNU Mailutils -AM_GNU_MAILUTILS(1.0, [all sieve cfg argp], [:]) +AM_GNU_MAILUTILS(1.0, [all auth sieve cfg argp], [:]) AC_CHECK_HEADERS([mailutils/syslog.h]) diff --git a/gacopyz/gacopyz.c b/gacopyz/gacopyz.c index 24f694e8..4f066615 100644 --- a/gacopyz/gacopyz.c +++ b/gacopyz/gacopyz.c @@ -238,7 +238,7 @@ do_connect(gacopyz_conn_t conn, } pnum = htons(pnum); } else { - struct servent *sp = getservbyname(path, "tcp"); + struct servent *sp = getservbyname(port, "tcp"); if (!sp) { gacopyz_log(conn, SMI_LOG_ERR, _("%s: invalid connection type: %s; " diff --git a/src/dnsbase.c b/src/dnsbase.c index ba5de172..8c0eb28e 100644 --- a/src/dnsbase.c +++ b/src/dnsbase.c @@ -258,6 +258,9 @@ struct loop_data { size_t loopcnt; /* Number of CNAME loops allowed */ }; +#ifndef MAX +# define MAX(a,b) ((a) < (b) ? (b) : (a)) +#endif #define NSIZE MAX(MAXPACKET, MAXDNAME*2+2) #define SET_STATUS(lp,s) if ((lp)->status != dns_success) (lp)->status = s diff --git a/src/mailfromd.h b/src/mailfromd.h index ff533745..20e2d360 100644 --- a/src/mailfromd.h +++ b/src/mailfromd.h @@ -47,6 +47,10 @@ # define EX__MAX 78 /* maximum listed value */ #endif +#ifndef INADDR_NONE +# define INADDR_NONE ((unsigned long) -1) +#endif + /* NLS */ #undef _ #undef N_ |