[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Mailutils branch, master, updated. release-2.2-131-g0433442
|
From: |
Sergey Poznyakoff |
|
Subject: |
[SCM] GNU Mailutils branch, master, updated. release-2.2-131-g0433442 |
|
Date: |
Thu, 07 Oct 2010 20:54:57 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".
http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=043344271a4bb538d5a044c6757ea8617bb506ad
The branch, master has been updated
via 043344271a4bb538d5a044c6757ea8617bb506ad (commit)
via 72b336385867d935a2e6d098a833a35089dbf139 (commit)
from dd8d091ba3cae58fd437c664478de8bcbdf25ac6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 043344271a4bb538d5a044c6757ea8617bb506ad
Author: Sergey Poznyakoff <address@hidden>
Date: Thu Oct 7 22:56:35 2010 +0300
Improve maidag, add testsuite.
* configure.ac: Add maidag/tests
* maidag/Makefile.am (SUBDIRS): Add tests.
* maidag/deliver.c (make_tmp): Write a
message delimiter.
(is_remote_url, is_mailer_url): Remove.
(deliver_url): Allow for URLs without user name.
* maidag/lmtp.c (lmtp_set_privs): Empty group list
means do not switch to any groups.
* maidag/maidag.c (mda_mode): New variable.
(options): New option --mda.
(cb_group, cb2_group): Create the list even if it is empty.
(main): Handle --mda.
* maidag/tests/.gitignore: New file.
* maidag/tests/Makefile.am: New file.
* maidag/tests/atlocal.in: New file.
* maidag/tests/input.msg: New file.
* maidag/tests/lmtp.at: New file.
* maidag/tests/mda.at: New file.
* maidag/tests/testsuite.at: New file.
* maidag/tests/url-mbox.at: New file.
* maidag/tests/input.msg: New file.
commit 72b336385867d935a2e6d098a833a35089dbf139
Author: Sergey Poznyakoff <address@hidden>
Date: Thu Oct 7 18:19:27 2010 +0300
Fix a silly copy-paste error.
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 3 +
frm/tests/testsuite.at | 1 -
libmailutils/tests/address.at | 1 -
libmailutils/tests/argcv.at | 1 -
libmailutils/tests/base64d.at | 1 -
libmailutils/tests/base64e.at | 1 -
libmailutils/tests/decode2047.at | 1 -
libmailutils/tests/encode2047.at | 1 -
libmailutils/tests/fromflt.at | 1 -
libmailutils/tests/list.at | 1 -
libmailutils/tests/mailcap.at | 1 -
libmailutils/tests/testsuite.at | 1 -
libmailutils/tests/url.at | 1 -
maidag/Makefile.am | 6 ++-
maidag/deliver.c | 37 ++-----------
maidag/lmtp.c | 9 +++-
maidag/maidag.c | 31 ++++++++---
{messages => maidag}/tests/.gitignore | 0
{frm => maidag}/tests/Makefile.am | 8 ++-
{messages => maidag}/tests/atlocal.in | 2 +-
maidag/tests/input.msg | 44 +++++++++++++++
maidag/tests/lmtp.at | 58 ++++++++++++++++++++
maidag/tests/mda.at | 50 +++++++++++++++++
{testsuite => maidag/tests}/testsuite.at | 17 +++++--
testsuite/testsuite.at => maidag/tests/url-mbox.at | 23 ++++++--
messages/tests/testsuite.at | 1 -
readmsg/tests/all.at | 1 -
readmsg/tests/hdr.at | 3 +-
readmsg/tests/nohdr.at | 1 -
readmsg/tests/testsuite.at | 1 -
readmsg/tests/twomsg.at | 1 -
readmsg/tests/weed.at | 3 +-
sieve/tests/action.at | 1 -
sieve/tests/address.at | 1 -
sieve/tests/allof.at | 1 -
sieve/tests/anyof.at | 1 -
sieve/tests/compile.at | 1 -
sieve/tests/envelope.at | 1 -
sieve/tests/exists.at | 1 -
sieve/tests/ext.at | 1 -
sieve/tests/false.at | 1 -
sieve/tests/header.at | 1 -
sieve/tests/i-casemap.at | 1 -
sieve/tests/i-numeric.at | 1 -
sieve/tests/i-octet.at | 1 -
sieve/tests/mul-addr.at | 1 -
sieve/tests/not.at | 1 -
sieve/tests/redirect.at | 1 -
sieve/tests/reject.at | 1 -
sieve/tests/relational.at | 1 -
sieve/tests/size.at | 1 -
sieve/tests/testsuite.at | 1 -
sieve/tests/true.at | 1 -
sieve/tests/version.at | 1 -
testsuite/mbdel.at | 1 -
testsuite/mime.at | 1 -
testsuite/testsuite.at | 3 +-
57 files changed, 233 insertions(+), 105 deletions(-)
copy {messages => maidag}/tests/.gitignore (100%)
copy {frm => maidag}/tests/Makefile.am (94%)
copy {messages => maidag}/tests/atlocal.in (72%)
create mode 100644 maidag/tests/input.msg
create mode 100644 maidag/tests/lmtp.at
create mode 100644 maidag/tests/mda.at
copy {testsuite => maidag/tests}/testsuite.at (65%)
copy testsuite/testsuite.at => maidag/tests/url-mbox.at (58%)
diff --git a/configure.ac b/configure.ac
index 796c468..2068a9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1214,6 +1214,7 @@ AC_ARG_WITH([mh-bindir],
AC_CONFIG_TESTDIR(libmailutils/tests)
AC_CONFIG_TESTDIR(testsuite)
AC_CONFIG_TESTDIR(frm/tests)
+AC_CONFIG_TESTDIR(maidag/tests)
AC_CONFIG_TESTDIR(messages/tests)
AC_CONFIG_TESTDIR(readmsg/tests)
AC_CONFIG_TESTDIR(sieve/tests)
@@ -1224,6 +1225,8 @@ AC_CONFIG_FILES([libmailutils/tests/Makefile
testsuite/atlocal
frm/tests/Makefile
frm/tests/atlocal
+ maidag/tests/Makefile
+ maidag/tests/atlocal
messages/tests/Makefile
messages/tests/atlocal
readmsg/tests/Makefile
diff --git a/frm/tests/testsuite.at b/frm/tests/testsuite.at
index c55f3a6..1a3e6f0 100644
--- a/frm/tests/testsuite.at
+++ b/frm/tests/testsuite.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
m4_include([testsuite.inc])
diff --git a/libmailutils/tests/address.at b/libmailutils/tests/address.at
index c62dc22..0a2bd26 100644
--- a/libmailutils/tests/address.at
+++ b/libmailutils/tests/address.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
dnl ------------------------------------------------------------
dnl TESTADDR(ADDR, [KW = `'], [STATUS = `0'], [STDOUT = `'],
diff --git a/libmailutils/tests/argcv.at b/libmailutils/tests/argcv.at
index 9ef8652..ca932e5 100644
--- a/libmailutils/tests/argcv.at
+++ b/libmailutils/tests/argcv.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
dnl ------------------------------------------------------------
dnl TESTARGS([NAME], [KW = `'], [INPUT], [STDOUT = `'],
diff --git a/libmailutils/tests/base64d.at b/libmailutils/tests/base64d.at
index df1efd3..9b68e3e 100644
--- a/libmailutils/tests/base64d.at
+++ b/libmailutils/tests/base64d.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
AT_SETUP([base64 decoding (read)])
AT_KEYWORDS([base64 base64d base64dr decode filter])
diff --git a/libmailutils/tests/base64e.at b/libmailutils/tests/base64e.at
index b94522e..0799fcf 100644
--- a/libmailutils/tests/base64e.at
+++ b/libmailutils/tests/base64e.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
AT_SETUP([base64 encoding (read)])
AT_KEYWORDS([base64 base64e base64er encode filter])
diff --git a/libmailutils/tests/decode2047.at b/libmailutils/tests/decode2047.at
index c33e1fb..2a5fa38 100644
--- a/libmailutils/tests/decode2047.at
+++ b/libmailutils/tests/decode2047.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
dnl ------------------------------------------------------------
dnl TESTDEC2047([NAME], [KW = `'], [INPUT], [STDOUT = `'],
diff --git a/libmailutils/tests/encode2047.at b/libmailutils/tests/encode2047.at
index 3b914e6..ed59672 100644
--- a/libmailutils/tests/encode2047.at
+++ b/libmailutils/tests/encode2047.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
AT_SETUP([encode2047])
AT_KEYWORDS([encode])
diff --git a/libmailutils/tests/fromflt.at b/libmailutils/tests/fromflt.at
index a5b3313..e03bf11 100644
--- a/libmailutils/tests/fromflt.at
+++ b/libmailutils/tests/fromflt.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
# -------------------------------------------
# Data for 'From' filter tests.
diff --git a/libmailutils/tests/list.at b/libmailutils/tests/list.at
index 2309120..093a9d4 100644
--- a/libmailutils/tests/list.at
+++ b/libmailutils/tests/list.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
dnl ------------------------------------------------------------
dnl TESTLIST([NAME], [KW = `'], [INPUT], [STDOUT = `'],
diff --git a/libmailutils/tests/mailcap.at b/libmailutils/tests/mailcap.at
index ef071c6..e3673db 100644
--- a/libmailutils/tests/mailcap.at
+++ b/libmailutils/tests/mailcap.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
dnl ------------------------------------------------------------
dnl MAILCAP([NAME], [KW = `'], [INPUT], [STDOUT = `'],
diff --git a/libmailutils/tests/testsuite.at b/libmailutils/tests/testsuite.at
index fbdc7c9..46e04b3 100644
--- a/libmailutils/tests/testsuite.at
+++ b/libmailutils/tests/testsuite.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
m4_include([testsuite.inc])
diff --git a/libmailutils/tests/url.at b/libmailutils/tests/url.at
index c22d998..010d328 100644
--- a/libmailutils/tests/url.at
+++ b/libmailutils/tests/url.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
dnl ------------------------------------------------------------
dnl TESTURL([NAME], [KW = `'], [INPUT], [STDOUT = `'],
diff --git a/maidag/Makefile.am b/maidag/Makefile.am
index 835f895..50fb709 100644
--- a/maidag/Makefile.am
+++ b/maidag/Makefile.am
@@ -15,8 +15,7 @@
# Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA
-INCLUDES = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ @GUILE_INCLUDES@ \
- @PYTHON_INCLUDES@
+SUBDIRS = . tests
sbin_PROGRAMS=maidag
maidag_SOURCES=\
@@ -51,6 +50,9 @@ maidag_LDADD = \
@address@hidden
@TCPWRAP_LIBRARIES@
+INCLUDES = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ @GUILE_INCLUDES@ \
+ @PYTHON_INCLUDES@
+
install-exec-hook:
for i in $(sbin_PROGRAMS); do\
chown root:mail $(DESTDIR)$(sbindir)/$$i;\
diff --git a/maidag/deliver.c b/maidag/deliver.c
index d5bbc1f..cd211d8 100644
--- a/maidag/deliver.c
+++ b/maidag/deliver.c
@@ -90,7 +90,9 @@ make_tmp (const char *from)
free (buf);
rc = mu_stream_copy (out, in, 0, NULL);
-
+ if (rc == 0)
+ /* Write out message delimiter */
+ mu_stream_write (out, "\n", 1, NULL);
mu_stream_destroy (&in);
if (rc)
{
@@ -347,26 +349,6 @@ deliver_to_user (mu_mailbox_t mbox, mu_message_t msg,
return failed ? exit_code : 0;
}
-static int
-is_remote_url (mu_url_t url)
-{
- const char *scheme;
- int rc = mu_url_sget_scheme (url, &scheme);
- return rc == 0 && strncmp (scheme, "remote+", 7) == 0;
-}
-
-static int
-is_mailer_url (mu_url_t url)
-{
- mu_record_t record = NULL;
- int (*pfn) (mu_mailer_t) = NULL;
-
- return mu_registrar_lookup_url (url, MU_FOLDER_ATTRIBUTE_FILE,
- &record, NULL) == 0
- && mu_record_get_mailer (record, &pfn) == 0
- && pfn;
-}
-
int
deliver_url (mu_url_t url, mu_message_t msg, const char *name, char **errp)
{
@@ -491,18 +473,7 @@ deliver (mu_message_t msg, char *dest_id, char **errp)
}
status = mu_url_sget_user (url, &name);
if (status == MU_ERR_NOENT)
- {
- if (!is_mailer_url (url) && !is_remote_url (url))
- {
- maidag_error (_("no user name"));
- if (errp)
- asprintf (errp, "no such user");
- exit_code = EX_NOUSER;
- return EX_NOUSER;
- }
- else
- name = NULL;
- }
+ name = NULL;
else if (status)
{
maidag_error (_("%s: cannot get user name from url: %s"),
diff --git a/maidag/lmtp.c b/maidag/lmtp.c
index 726be15..eca152d 100644
--- a/maidag/lmtp.c
+++ b/maidag/lmtp.c
@@ -607,7 +607,14 @@ lmtp_set_privs ()
mu_iterator_t itr;
int rc;
- mu_list_count (lmtp_groups, &size);
+ rc = mu_list_count (lmtp_groups, &size);
+ if (rc)
+ {
+ mu_diag_funcall (MU_DIAG_ERROR, "mu_list_count", NULL, rc);
+ return EX_UNAVAILABLE;
+ }
+ if (size == 0)
+ return 0; /* nothing to do */
gidset = calloc (size, sizeof (gidset[0]));
if (!gidset)
{
diff --git a/maidag/maidag.c b/maidag/maidag.c
index ff5c34b..e1bebc0 100644
--- a/maidag/maidag.c
+++ b/maidag/maidag.c
@@ -18,6 +18,8 @@
#include "maidag.h"
+int mda_mode; /* Force local MDA mode even if not started as
+ root */
int multiple_delivery; /* Don't return errors when delivering to multiple
recipients */
int ex_quota_tempfail; /* Return temporary failure if mailbox quota is
@@ -74,6 +76,7 @@ static char args_doc[] = N_("[recipient...]");
#define FOREGROUND_OPTION 260
#define URL_OPTION 261
#define TRANSCRIPT_OPTION 262
+#define MDA_OPTION 263
static struct argp_option options[] =
{
@@ -87,6 +90,8 @@ static struct argp_option options[] =
{ "daemon", 'd', N_("NUMBER"), OPTION_ARG_OPTIONAL,
N_("runs in daemon mode with a maximum of NUMBER children"), GRID + 1 },
{ "url", URL_OPTION, 0, 0, N_("deliver to given URLs"), GRID + 1 },
+ { "mda", MDA_OPTION, 0, 0, N_("force MDA mode even if not started as root"),
+ GRID + 1 },
{ "from", 'f', N_("EMAIL"), 0,
N_("specify the sender's name"), GRID + 1 },
{ NULL, 'r', NULL, OPTION_ALIAS, NULL },
@@ -216,6 +221,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
mu_argp_node_list_new (lst, "listen", arg);
break;
+ case MDA_OPTION:
+ mda_mode = 1;
+ break;
+
case TRANSCRIPT_OPTION:
maidag_transcript = 1;
break;
@@ -292,23 +301,25 @@ cb_debug (mu_debug_t debug, void *data, mu_config_value_t
*val)
static int
cb2_group (mu_debug_t debug, const char *gname, void *data)
{
- mu_list_t *plist = data;
+ mu_list_t list = data;
struct group *group;
- if (!*plist)
- mu_list_create (plist);
group = getgrnam (gname);
if (!group)
mu_cfg_format_error (debug, MU_DEBUG_ERROR, _("unknown group: %s"), gname);
else
- mu_list_append (*plist, (void*)group->gr_gid);
+ mu_list_append (list, (void*)group->gr_gid);
return 0;
}
static int
cb_group (mu_debug_t debug, void *data, mu_config_value_t *arg)
{
- return mu_cfg_string_value_cb (debug, arg, cb2_group, data);
+ mu_list_t *plist = data;
+
+ if (!*plist)
+ mu_list_create (plist);
+ return mu_cfg_string_value_cb (debug, arg, cb2_group, *plist);
}
static struct mu_kwd forward_checks[] = {
@@ -540,9 +551,11 @@ main (int argc, char *argv[])
exit (EX_CONFIG);
current_uid = getuid ();
-
+ if (!lmtp_mode && current_uid == 0)
+ mda_mode = 1;
+
if (log_to_stderr == -1)
- log_to_stderr = url_option || (!lmtp_mode && (current_uid != 0));
+ log_to_stderr = url_option || (!lmtp_mode && !mda_mode);
mu_diag_get_debug (&debug);
if (!log_to_stderr)
@@ -571,7 +584,7 @@ main (int argc, char *argv[])
}
else
{
- if (current_uid)
+ if (!mda_mode)
{
if (url_option)
{
@@ -582,7 +595,7 @@ main (int argc, char *argv[])
static char *s_argv[2];
struct mu_auth_data *auth = mu_get_auth_by_uid (current_uid);
- if (!current_uid)
+ if (!auth)
{
mu_error (_("cannot get username"));
return EX_UNAVAILABLE;
diff --git a/messages/tests/.gitignore b/maidag/tests/.gitignore
similarity index 100%
copy from messages/tests/.gitignore
copy to maidag/tests/.gitignore
diff --git a/frm/tests/Makefile.am b/maidag/tests/Makefile.am
similarity index 94%
copy from frm/tests/Makefile.am
copy to maidag/tests/Makefile.am
index b548c51..65abc82 100644
--- a/frm/tests/Makefile.am
+++ b/maidag/tests/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4
+EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 input.msg
DISTCLEANFILES = atconfig $(check_SCRIPTS)
MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
@@ -38,7 +38,11 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
## Test suite. ##
## ------------ ##
-TESTSUITE_AT = testsuite.at
+TESTSUITE_AT = \
+ lmtp.at\
+ mda.at\
+ testsuite.at\
+ url-mbox.at
TESTSUITE = $(srcdir)/testsuite
M4=m4
diff --git a/messages/tests/atlocal.in b/maidag/tests/atlocal.in
similarity index 72%
copy from messages/tests/atlocal.in
copy to maidag/tests/atlocal.in
index 98f8248..1fa4ce6 100644
--- a/messages/tests/atlocal.in
+++ b/maidag/tests/atlocal.in
@@ -2,5 +2,5 @@
# Configurable variable values for Mailutils test suite.
# Copyright (C) 2004, 2010 Free Software Foundation, Inc.
address@hidden@:@abs_top_builddir@/messages:$top_srcdir:$srcdir:$PATH
address@hidden@:@abs_top_builddir@/maidag:$top_srcdir:$srcdir:$PATH
diff --git a/maidag/tests/input.msg b/maidag/tests/input.msg
new file mode 100644
index 0000000..e72ad7b
--- /dev/null
+++ b/maidag/tests/input.msg
@@ -0,0 +1,44 @@
+From: "Lemuel Gulliver, esq." <address@hidden>
+To: root
+Subject: Travels into several remote Nations of the World
+
+A LETTER from Capt. Gulliver, to his Cousin Sympson
+
+I HOPE you will be ready to own publickly, whenever you shall be called
+to it, that by your great and frequent Urgency you prevailed on me to
+publish a very loose and uncorrect Account of my Travels; with Direction
+to hire some young Gentlemen of either University to put them in Order,
+and correct the Style, as my Cousin Dampier did by my Advice, in his
+Book called A Voyage round the World. But I do not remember I gave you
+Power to consent that any thing should be omitted, and much less that any
+thing should be inserted: therefore, as to the latter, I do here renounce
+every thing of that Kind; particularly a Paragraph about her Majesty the
+late Queen Anne, of most pious and glorious Memory; although I did
+reverence and esteem her more than any of human Species. But you, or
+your Interpolator, ought to have considered, that as it was not my
+Inclination, so was it not decent to praise any Animal of our Composition
+before my Master Houyhnhnm: And besides the Fact was altogether false;
+for to my Knowledge, being in England during some Part of her Majesty's
+Reign, she did govern by a chief Minister; nay, even by two successively;
+the first whereof was the Lord of Godolphin, and the second the Lord of
+Oxford; so that you have made me say the thing that was not. Likewise, in
+the Account of the Academy of Projectors, and several Passages of my
+Discourse to my Master Houyhnhnm, you have either omitted some
+material Circumstances, or minced or changed them in such a Manner, that
+I do hardly know mine own Work. When I formerly hinted to you
+something of this in a Letter, you were pleased to answer that you were
+afraid of giving Offense; that People in Power were very watchful over the
+Press, and apt not only to interpret, but to punish every thing which looked
+like an Innuendo (as I think you called it.) But pray, how could that which
+I spoke so many Years ago, and at about five Thousand leagues distance, in
+another Reign, be applied to any of the Yahoos who now are said to govern
+the Herd; especially at a time when I little thought on or feared the
+Unhappiness of living under them. Have not I the most reason to complain,
+when I see these very Yahoos carried by Houyhnhnms in a Vehicle, as if
+these were Brutes, and those the rational Creatures? And indeed, to avoid
+so monstrous and detestable a Sight was one principal Motive of my
+Retirement hither.
+
+Thus much I thought proper to tell you in Relation to yourself, and to the
+Trust I reposed in you.
+
diff --git a/maidag/tests/lmtp.at b/maidag/tests/lmtp.at
new file mode 100644
index 0000000..2cba9e7
--- /dev/null
+++ b/maidag/tests/lmtp.at
@@ -0,0 +1,58 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([LMTP mode])
+AT_KEYWORDS([maidag lmtp])
+
+m4_pushdef([tocrlf],[dnl
+$abs_top_builddir/libmailutils/tests/fltst crlf encode read])
+
+AT_CHECK([
+AT_DATA([session_start],[LHLO localhost
+MAIL FROM:<address@hidden>
+RCPT TO:<address@hidden>
+DATA
+])
+AT_DATA([session_end],[.
+QUIT
+])
+
+echo ENVELOPE > expout
+cat $abs_top_srcdir/maidag/tests/input.msg >> expout
+echo "" >> expout
+
+cat session_start $abs_top_srcdir/maidag/tests/input.msg session_end | tocrlf
> session || exit $?
+
+mkdir spool
+maidag MAIDAG_OPTIONS --set 'group=()' --lmtp < session >transcript || exit $?
+
+sed '1s/From address@hidden/ENVELOPE/' spool/root
+cat transcript | tr -d '\r' | sed '/...-/d;s/ .*//' >&2
+],
+[0],
+[expout],
+[220
+250
+250
+250
+354
+250
+221
+])
+
+AT_CLEANUP
+
+m4_popdef([tocrlf])
diff --git a/maidag/tests/mda.at b/maidag/tests/mda.at
new file mode 100644
index 0000000..a871eaa
--- /dev/null
+++ b/maidag/tests/mda.at
@@ -0,0 +1,50 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([MDA mode])
+AT_KEYWORDS([maidag mda0])
+
+AT_CHECK([
+echo ENVELOPE > expout
+cat $abs_top_srcdir/maidag/tests/input.msg >> expout
+echo "" >> expout
+mkdir spool
+maidag MAIDAG_OPTIONS --mda --from address@hidden root < dnl
+ $abs_top_srcdir/maidag/tests/input.msg || exit $?
+sed '1s/From address@hidden/ENVELOPE/' spool/root
+],
+[0],
+[expout])
+
+AT_CLEANUP
+
+#
+AT_SETUP([MDA mode, explicit envelope])
+AT_KEYWORDS([maidag mda1])
+
+AT_CHECK([
+echo "From gulliver Thu Oct 7 19:10:57 2010" > expout
+cat $abs_top_srcdir/maidag/tests/input.msg >> expout
+mkdir spool
+maidag MAIDAG_OPTIONS --mda --from address@hidden root < expout || exit $?
+echo "" >> expout
+cat spool/root
+],
+[0],
+[expout])
+
+AT_CLEANUP
+
diff --git a/testsuite/testsuite.at b/maidag/tests/testsuite.at
similarity index 65%
copy from testsuite/testsuite.at
copy to maidag/tests/testsuite.at
index e9dde07..b56d63d 100644
--- a/testsuite/testsuite.at
+++ b/maidag/tests/testsuite.at
@@ -6,18 +6,27 @@
# published by the Free Software Foundation; either version 3, or (at
# your option) any later version.
#
-# This program is distributed in the hope that it will be useful, but
+# GNU Mailutils is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
m4_include([testsuite.inc])
+m4_define([MAIDAG_OPTIONS],[dnl
+--no-site-config dnl
+--no-user-config dnl
+--set '|mailbox|mailbox-pattern='`pwd`/spool/'${user}' dnl
+--set .auth.authorization=system dnl
+--stderr])
+
AT_INIT
+AT_TESTED([maidag])
+MUT_VERSION(maidag)
+m4_include([mda.at])
+m4_include([lmtp.at])
+m4_include([url-mbox.at])
-m4_include([mime.at])
-m4_include([mbdel.at])
\ No newline at end of file
diff --git a/testsuite/testsuite.at b/maidag/tests/url-mbox.at
similarity index 58%
copy from testsuite/testsuite.at
copy to maidag/tests/url-mbox.at
index e9dde07..dd29ab4 100644
--- a/testsuite/testsuite.at
+++ b/maidag/tests/url-mbox.at
@@ -6,18 +6,29 @@
# published by the Free Software Foundation; either version 3, or (at
# your option) any later version.
#
-# This program is distributed in the hope that it will be useful, but
+# GNU Mailutils is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
-m4_include([testsuite.inc])
+AT_SETUP([URL mode])
+AT_KEYWORDS([maidag url-mbox url])
-AT_INIT
+AT_CHECK([
+echo ENVELOPE > expout
+cat $abs_top_srcdir/maidag/tests/input.msg >> expout
+echo "" >> expout
+mkdir spool
-m4_include([mime.at])
-m4_include([mbdel.at])
\ No newline at end of file
+maidag MAIDAG_OPTIONS --from 'address@hidden' --url mbox:spool/out < dnl
+ $abs_top_srcdir/maidag/tests/input.msg || exit $?
+sed '1s/From address@hidden/ENVELOPE/' spool/out
+],
+[0],
+[expout])
+
+AT_CLEANUP
+
\ No newline at end of file
diff --git a/messages/tests/testsuite.at b/messages/tests/testsuite.at
index 04ff126..627b1bb 100644
--- a/messages/tests/testsuite.at
+++ b/messages/tests/testsuite.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
m4_include([testsuite.inc])
diff --git a/readmsg/tests/all.at b/readmsg/tests/all.at
index 741d37d..67ab085 100644
--- a/readmsg/tests/all.at
+++ b/readmsg/tests/all.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
READMSGTEST([readmsg *],[readmsg00],
['*'],
diff --git a/readmsg/tests/hdr.at b/readmsg/tests/hdr.at
index ffbcff5..08395c7 100644
--- a/readmsg/tests/hdr.at
+++ b/readmsg/tests/hdr.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
READMSGTEST([readmsg -h],[hdr],
[readmsg -h SOMETHING],
@@ -34,4 +33,4 @@ exactly know what they are! However, SOMEBODY killed
SOMETHING:
that's clear, at any rate...
-])
\ No newline at end of file
+])
diff --git a/readmsg/tests/nohdr.at b/readmsg/tests/nohdr.at
index fb61e39..6ddf5e9 100644
--- a/readmsg/tests/nohdr.at
+++ b/readmsg/tests/nohdr.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
READMSGTEST([readmsg -n],[nohdr],
[readmsg -n SOMETHING],
diff --git a/readmsg/tests/testsuite.at b/readmsg/tests/testsuite.at
index e905637..49305aa 100644
--- a/readmsg/tests/testsuite.at
+++ b/readmsg/tests/testsuite.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
# Require a reasonably recent autotest.
m4_include([testsuite.inc])
diff --git a/readmsg/tests/twomsg.at b/readmsg/tests/twomsg.at
index a459927..577af51 100644
--- a/readmsg/tests/twomsg.at
+++ b/readmsg/tests/twomsg.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
READMSGTEST([readmsg 1 2],[twomsg],
[1 2],
diff --git a/readmsg/tests/weed.at b/readmsg/tests/weed.at
index 469cf1a..bf2c1fc 100644
--- a/readmsg/tests/weed.at
+++ b/readmsg/tests/weed.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
READMSGTEST([readmsg -w],[weed],
[-w date,subject SOMETHING],
@@ -27,4 +26,4 @@ exactly know what they are! However, SOMEBODY killed
SOMETHING:
that's clear, at any rate...
-])
\ No newline at end of file
+])
diff --git a/sieve/tests/action.at b/sieve/tests/action.at
index d56f566..2da7723 100644
--- a/sieve/tests/action.at
+++ b/sieve/tests/action.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
MUT_TESTCASE([action stop], [], [stop;],[],[0],[],
[STOP on msg uid 1
diff --git a/sieve/tests/address.at b/sieve/tests/address.at
index 36c5d14..88499dd 100644
--- a/sieve/tests/address.at
+++ b/sieve/tests/address.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
MUT_TESTCASE([address :all],[test address all address-all],
[
diff --git a/sieve/tests/allof.at b/sieve/tests/allof.at
index 5f32395..369d32a 100644
--- a/sieve/tests/allof.at
+++ b/sieve/tests/allof.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
MUT_TESTCASE([allof 00],[test allof allof00],
[
diff --git a/sieve/tests/anyof.at b/sieve/tests/anyof.at
index 1f994c1..ba4e9a1 100644
--- a/sieve/tests/anyof.at
+++ b/sieve/tests/anyof.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
MUT_TESTCASE([anyof 00],[test anyof anyof00],
[
diff --git a/sieve/tests/compile.at b/sieve/tests/compile.at
index 221054b..8bdab9c 100644
--- a/sieve/tests/compile.at
+++ b/sieve/tests/compile.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
testcompile([ex-null.sv])
testcompile([box.sv])
diff --git a/sieve/tests/envelope.at b/sieve/tests/envelope.at
index a12f0ae..375accc 100644
--- a/sieve/tests/envelope.at
+++ b/sieve/tests/envelope.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
MUT_TESTCASE([envelope],[test envelope],
[
diff --git a/sieve/tests/exists.at b/sieve/tests/exists.at
index 1fad0a3..41095d9 100644
--- a/sieve/tests/exists.at
+++ b/sieve/tests/exists.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
MUT_TESTCASE([exists: single header],[test exists exists01],
[
diff --git a/sieve/tests/ext.at b/sieve/tests/ext.at
index 16d846a..ab9fc92 100644
--- a/sieve/tests/ext.at
+++ b/sieve/tests/ext.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
AT_SETUP([loadable extensions: numaddr])
AT_KEYWORDS([ext])
diff --git a/sieve/tests/false.at b/sieve/tests/false.at
index 0d0750a..5dae588 100644
--- a/sieve/tests/false.at
+++ b/sieve/tests/false.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
MUT_TESTCASE([false],[test constant false],
[
diff --git a/sieve/tests/header.at b/sieve/tests/header.at
index bbf8c68..ecb99be 100644
--- a/sieve/tests/header.at
+++ b/sieve/tests/header.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
MUT_TESTCASE([header :is],[test header header-is],
[
diff --git a/sieve/tests/i-casemap.at b/sieve/tests/i-casemap.at
index ec1b04a..3b34194 100644
--- a/sieve/tests/i-casemap.at
+++ b/sieve/tests/i-casemap.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
MUT_TESTCASE([i-casemap :is],[comparator i-casemap i-casemap-is],
[
diff --git a/sieve/tests/i-numeric.at b/sieve/tests/i-numeric.at
index 14c72ff..a62ff28 100644
--- a/sieve/tests/i-numeric.at
+++ b/sieve/tests/i-numeric.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
MUT_TESTCASE([i-numeric :is], [comparator i-numeric is i-numeric-is],
[
diff --git a/sieve/tests/i-octet.at b/sieve/tests/i-octet.at
index 8d4b6c2..13049ad 100644
--- a/sieve/tests/i-octet.at
+++ b/sieve/tests/i-octet.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
MUT_TESTCASE([i-octet :is],[comparator i-octet is i-octet-is],
[
diff --git a/sieve/tests/mul-addr.at b/sieve/tests/mul-addr.at
index 08fb3d5..b11f4f5 100644
--- a/sieve/tests/mul-addr.at
+++ b/sieve/tests/mul-addr.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
m4_pushdef([MUT_SIEVE_MAILBOX],[relational.mbox])
MUT_TESTCASE([multiple addresses],[test address mul-addr],
diff --git a/sieve/tests/not.at b/sieve/tests/not.at
index 26962f4..cf4e4c5 100644
--- a/sieve/tests/not.at
+++ b/sieve/tests/not.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
MUT_TESTCASE([not], [test not boolean],
[
diff --git a/sieve/tests/redirect.at b/sieve/tests/redirect.at
index fbe43c2..37291f4 100644
--- a/sieve/tests/redirect.at
+++ b/sieve/tests/redirect.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
AT_SETUP([redirect])
AT_KEYWORDS([action])
diff --git a/sieve/tests/reject.at b/sieve/tests/reject.at
index 653e5a1..f1253f6 100644
--- a/sieve/tests/reject.at
+++ b/sieve/tests/reject.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
AT_SETUP([reject])
AT_KEYWORDS([action])
diff --git a/sieve/tests/relational.at b/sieve/tests/relational.at
index ddca148..c68ab22 100644
--- a/sieve/tests/relational.at
+++ b/sieve/tests/relational.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
m4_pushdef([MUT_SIEVE_MAILBOX],[relational.mbox])
m4_pushdef([MUT_SIEVE_OPTIONS],[--set ":mailbox:folder=`pwd`" dnl
diff --git a/sieve/tests/size.at b/sieve/tests/size.at
index ab20800..e809e82 100644
--- a/sieve/tests/size.at
+++ b/sieve/tests/size.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
MUT_TESTCASE([size :under],[test size under size-under],
[
diff --git a/sieve/tests/testsuite.at b/sieve/tests/testsuite.at
index c32aba6..a9ee7ce 100644
--- a/sieve/tests/testsuite.at
+++ b/sieve/tests/testsuite.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
m4_include([testsuite.inc])
diff --git a/sieve/tests/true.at b/sieve/tests/true.at
index 36e8a91..d1065de 100644
--- a/sieve/tests/true.at
+++ b/sieve/tests/true.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
MUT_TESTCASE([true],[test constant true],
[
diff --git a/sieve/tests/version.at b/sieve/tests/version.at
index b4375f8..ce951a9 100644
--- a/sieve/tests/version.at
+++ b/sieve/tests/version.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
dnl m4_include([testsuite.inc])
diff --git a/testsuite/mbdel.at b/testsuite/mbdel.at
index a63e261..57dca63 100644
--- a/testsuite/mbdel.at
+++ b/testsuite/mbdel.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
dnl ------------------------------------------------------------
dnl MBDEL_TEST([FORMAT], [PROG],
diff --git a/testsuite/mime.at b/testsuite/mime.at
index 3e1c1dd..ff39da6 100644
--- a/testsuite/mime.at
+++ b/testsuite/mime.at
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
AT_SETUP([mime])
diff --git a/testsuite/testsuite.at b/testsuite/testsuite.at
index e9dde07..5686cfa 100644
--- a/testsuite/testsuite.at
+++ b/testsuite/testsuite.at
@@ -13,11 +13,10 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite.
m4_include([testsuite.inc])
AT_INIT
m4_include([mime.at])
-m4_include([mbdel.at])
\ No newline at end of file
+m4_include([mbdel.at])
hooks/post-receive
--
GNU Mailutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Mailutils branch, master, updated. release-2.2-131-g0433442,
Sergey Poznyakoff <=