Commit bc579b19 authored by Kent Engström's avatar Kent Engström
Browse files

Add support for the mx-refuse-import aux item.

parent b782d04c
......@@ -8744,6 +8744,30 @@ Only the author of the text can set this item. The data must be the
empty string. The hide-creator, secret, dont-garb and inherit bits
are automatically cleared.
@item mx-refuse-import [35] (conference, letterbox)
This item tells the importer under what circumstances mail should be
imported to the conference or letterbox. If no aux-item of this type is
present, there are no limitations on import to this conference or
letterbox.
If the data is the string @code{all}, the importer will never add this
conference or letterbox as a recipient.
If the data is the string @code{spam}, the importer will not add this
conference or letterbox as a recipient if the mail is considered to be
spam according to some importer specific criteria (such as the presence
of SpamAssassin flags).
In the future, other alternatives in addition to the above may be
defined for this aux-item. An importer should silently ignore
unrecognized ones. If more than one aux-item of this type is present,
they will be combined in the most restrictive way, i.e. the recipient
will not be added if any of the aux-items forbids import.
Clients are encouraged to provide commands to manage aux-items of this
type for conferences and letterboxes.
@item mx-mime-belongs-to [10100] (text)
Data is a decimal text number that this text is an attachment to. Most
......
#
# $Id: aux-items.conf,v 1.23 2002/07/30 23:50:45 ceder Exp $
# $Id: aux-items.conf,v 1.24 2002/11/10 20:06:02 kent Exp $
# Copyright (C) 1994-2002 Lysator Academic Computer Association.
#
# This file is part of the LysKOM server.
......@@ -468,6 +468,19 @@
inherit-limit = 1;
}
#
# Should importers refuse to add this conference as a recipient?
#
35 : mx-refuse-import (conference, letterbox)
{
supervisor-only = true;
owner-delete = true;
secret = false;
hide-creator = false;
validate = "^(all|spam)$";
}
#
# The text number of the mail that this mime part belongs to
#
......
......@@ -379,7 +379,7 @@ send "1113 95 0 { } 0 { }\n"
simple_expect "%1113 6 0" "modify-system-info"
# 96:query-predefined-aux-items
send "1114 96\n"
simple_expect "=1114 39 { 10104 10103 10102 10101 10100 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 }" "query-predefined-aux-items"
simple_expect "=1114 40 { 10104 10103 10102 10101 10100 35 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 }" "query-predefined-aux-items"
# 97:set-expire
send "1115 97 1 76\n"
simple_expect "%1115 6 0" "set-expire"
......
......@@ -138,7 +138,7 @@ simple_expect "=1009"
# exactly these aux-items. It shouldn't be hard to fix the test suite
# when more items are added.
send "1010 96\n"
simple_expect "=1010 39 { 10104 10103 10102 10101 10100 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 }"
simple_expect "=1010 40 { 10104 10103 10102 10101 10100 35 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 }"
send "1011 82\n"
simple_expect "=1011"
......@@ -1300,7 +1300,7 @@ simple_expect "=1348 $server_compat_version 1 2 3 4 0 1 { 1 9 5 $any_time 000000
# test call 96 (query-predefined-aux-items)
talk_to client 1
send "1349 96\n"
simple_expect "=1349 39 { 10104 10103 10102 10101 10100 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 }"
simple_expect "=1349 40 { 10104 10103 10102 10101 10100 35 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 }"
# test call 97 (set-expire)
send "1350 97 10 7123123\n"
......
......@@ -56,10 +56,10 @@ system "kill -WINCH $lyskomd_pid"
lyskomd_expect "Signal WINCH received. aux definitions reloaded."
send "1003 96\n"
simple_expect "=1003 39 { 10104 10103 10102 10101 10100 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 }"
simple_expect "=1003 40 { 10104 10103 10102 10101 10100 35 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 }"
send "1004 96\n"
simple_expect "=1004 39 { 10104 10103 10102 10101 10100 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 }"
simple_expect "=1004 40 { 10104 10103 10102 10101 10100 35 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 }"
copy_aux $srcdir/lyskomd.0/aux-items.conf
......@@ -92,7 +92,7 @@ system "kill -WINCH $lyskomd_pid"
lyskomd_expect "Signal WINCH received. aux definitions reloaded."
send "1009 96\n"
simple_expect "=1009 39 { 10104 10103 10102 10101 10100 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 }"
simple_expect "=1009 40 { 10104 10103 10102 10101 10100 35 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 }"
send "1010 42 255\n"
simple_expect "=1010"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment