diff options
| -rwxr-xr-x | imap/testsuite | 11 | ||||
| -rw-r--r-- | imap/testsuite.txt | 13 | ||||
| -rw-r--r-- | maildir/maildirmake.sgml | 58 |
3 files changed, 66 insertions, 16 deletions
diff --git a/imap/testsuite b/imap/testsuite index 1e065da..2762ddd 100755 --- a/imap/testsuite +++ b/imap/testsuite @@ -1142,3 +1142,14 @@ echo "===Trash=" ls confmdtest/.Trash/cur echo "===" rm -f confsendmail confsendmail.out + +../maildir/maildirmake -q 2C ./confmdtest +env IMAP_BROKENUIDV=1 IMAP_TRASHFOLDERNAME=Trash IMAP_EMPTYTRASH=Trash:7 \ + MAILDIR=confmdtest AUTHENTICATED=user1 OUTBOX=.Outbox \ + IMAP_KEYWORDS=2\ + IMAP_MOVE_EXPUNGE_TO_TRASH=1 \ + SENDMAIL=`pwd`/confsendmail $IMAPINVOKE <<EOF +U021 SELECT INBOX +U022 STORE 1 +FLAGS(Label1) +U023 COPY 1 INBOX +EOF diff --git a/imap/testsuite.txt b/imap/testsuite.txt index 31f882e..6ab1aad 100644 --- a/imap/testsuite.txt +++ b/imap/testsuite.txt @@ -1756,3 +1756,16 @@ 001462 003:2,AB 001463 msg:2 001464 === +001465 * PREAUTH Ready.
+001466 * FLAGS (\Draft \Answered \Flagged \Deleted \Seen \Recent)
+001467 * OK [PERMANENTFLAGS (\* \Draft \Answered \Flagged \Deleted \Seen)] Limited
+001468 * 2 EXISTS
+001469 * 0 RECENT
+001470 * OK [UIDVALIDITY] Ok
+001471 * OK [MYRIGHTS "acdilrsw"] ACL
+001472 U021 OK [READ-WRITE] Ok
+001473 * FLAGS (Label1 \Draft \Answered \Flagged \Deleted \Seen \Recent)
+001474 * OK [PERMANENTFLAGS (Label1 \* \Draft \Answered \Flagged \Deleted \Seen)] Limited
+001475 * 1 FETCH (FLAGS (\Seen Label1))
+001476 U022 OK STORE completed.
+001477 U023 NO [ALERT] You exceeded your mail quota.
diff --git a/maildir/maildirmake.sgml b/maildir/maildirmake.sgml index 57aebd6..8c058e8 100644 --- a/maildir/maildirmake.sgml +++ b/maildir/maildirmake.sgml @@ -41,42 +41,68 @@ implemented in the Qmail mail server.</para> <variablelist> <varlistentry><term><literal>-S</literal></term> - <listitem><simpara>create a "sharable" maildir. A sharable maildir has + <listitem><para>create a "sharable" maildir. A sharable maildir has slightly different permissions which allows creation of publicly-shared -folders.</simpara> +folders.</para> </listitem> </varlistentry> <varlistentry><term><literal>-q</literal> <replaceable>quota</replaceable></term> - <listitem><simpara>install a quota on the maildir. + <listitem> + <para>install a quota on the maildir. See <ulink url="maildirquota.html"><citerefentry><refentrytitle>maildirquota</refentrytitle><manvolnum>7</manvolnum></citerefentry></ulink> for more information. The specified maildir gets automatically created if it does not exist; otherwise the existing maildir's quota gets updated. - </simpara> + <replaceable>quota</replaceable> may be: + </para> + <variablelist> + <varlistentry> + <term><replaceable>####S</replaceable></term> + <listitem> + <para> + Specifies the quota in the total number of bytes for all + messages. + <quote>10000000S</quote> specifies a quota of ten million + bytes. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><replaceable>####C</replaceable></term> + <listitem> + <para> + Specifies the quota in the total number of messages in + the maildir. + <quote>10000S</quote> specifies a quota of ten thousand + messages. + </para> + </listitem> + </varlistentry> + </variablelist> </listitem> </varlistentry> <varlistentry><term><literal>-f</literal> <replaceable>folder</replaceable></term> - <listitem><simpara>do not create a maildir, but create a folder in an -existing maildir.</simpara> + <listitem><para>do not create a maildir, but create a folder in an +existing maildir.</para> </listitem> </varlistentry> <varlistentry><term><literal>-F</literal> <replaceable>folder</replaceable></term> - <listitem><simpara>Like the <literal>-f</literal> option, except + <listitem><para>Like the <literal>-f</literal> option, except that the folder's name is given using the system locale's character set. Non-Latin characters in the folder's name must be given to the <literal>-f</literal> option using IMAP's UTF8 encoding. The <literal>-F</literal> option takes the folder name specified using the console's character - set.</simpara> + set.</para> </listitem> </varlistentry> <varlistentry><term><literal>-s</literal> <replaceable>mode</replaceable></term> - <listitem><simpara>create a publicly accessible folder in an + <listitem><para>create a publicly accessible folder in an existing sharable maildir. First, use the <option>-S</option> option to create a sharable maildir. Then, run <command>maildirmake</command> again with the @@ -89,38 +115,38 @@ write messages to this folder; write messages to this folder; <literal>group</literal> - only allow members of your own system group to access messages in this folder (instead of -everyone).</simpara> +everyone).</para> </listitem> </varlistentry> <varlistentry><term><literal>--add</literal> <replaceable>name</replaceable>=<replaceable>pathname</replaceable>, <literal>--del</literal> <replaceable>name</replaceable></term> - <listitem><simpara> + <listitem><para> create or delete the directories and links needed to -access shared folders. See below for more information.</simpara> +access shared folders. See below for more information.</para> </listitem> </varlistentry> <varlistentry> <term><literal>--checkutf8</literal> <replaceable>maildir</replaceable> <replaceable>maildirfilter</replaceable></term> <listitem> - <simpara> + <para> Perform a sanity check to verify that a pre-unicode format maildir can be converted to a unicode-format maildir. See <quote>Converting pre-unicode format maildirs</quote>, below, for more information. - </simpara> + </para> </listitem> </varlistentry> <varlistentry> <term><literal>--convutf8</literal> <replaceable>maildir</replaceable> <replaceable>maildirfilter</replaceable></term> <listitem> - <simpara> + <para> Convert a pre-unicode format maildir can be converted to a unicode-format maildir. See <quote>Converting pre-unicode format maildirs</quote>, below, for more information. - </simpara> + </para> </listitem> </varlistentry> </variablelist> |