summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2008-02-06 19:08:31 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2008-02-06 19:08:31 (GMT)
commitb70dc468fb170a669bb312973163cbad7160cebf (patch) (side-by-side diff)
tree16b74fee86c4f8d5f558e630c1f64cc081be33df
parent870c5ff8a504fc07f583eebba8c0a290b1571f1d (diff)
downloadmailfromd-b70dc468fb170a669bb312973163cbad7160cebf.tar.gz
mailfromd-b70dc468fb170a669bb312973163cbad7160cebf.tar.bz2
* 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. git-svn-id: file:///svnroot/mailfromd/trunk@1606 7a8a7f39-df28-0410-adc6-e0d955640f24
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog7
-rwxr-xr-xbootstrap3
-rw-r--r--configure.ac5
-rw-r--r--gacopyz/gacopyz.c2
-rw-r--r--src/dnsbase.c3
-rw-r--r--src/mailfromd.h4
6 files changed, 20 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d7f45e..2e7557d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/bootstrap b/bootstrap
index c5d0106..4d3810e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -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 b2c4982..929d1bb 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 24f694e..4f06661 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 ba5de17..8c0eb28 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 ff53374..20e2d36 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_

Return to:

Send suggestions and report system problems to the System administrator.