X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=config%2Fconfig.c;h=1caea472e04a8075e1157fea2c6fc0d74214094e;hb=559039d546e7eb1d160c4e3bd3538845b645546e;hp=bd83bcb36da4eae0bf5910972482673a4632f125;hpb=5b92ee6942b9b466914f5faa5fa4c00a2ebc6d35;p=mmh

diff --git a/config/config.c b/config/config.c
index bd83bcb..1caea47 100644
--- a/config/config.c
+++ b/config/config.c
@@ -71,6 +71,7 @@ char *mhlreply       = "mhl.reply";        /* repl         */
 /* some default folder names */
 char *defaultfolder = "+inbox";
 char *draftfolder = "+drafts";
+char *trashfolder = "+trash";
 
 char *inbox = "Inbox";  /* profile entry name to specify the default folder */
 char *curfolder = "Current-Folder";
@@ -92,11 +93,6 @@ char *nsequence = "Sequence-Negation";
 
 /* profile entries for storage locations */
 char *nmhstorage   = "nmh-storage";
-char *nmhcache     = "nmh-cache";
-char *nmhprivcache = "nmh-private-cache";
-
-/* profile entry for external ftp access command */
-char *nmhaccessftp = "nmh-access-ftp";
 
 /* Default attachment header field name */
 char *attach_hdr = "Attach";
@@ -112,13 +108,6 @@ char *mimetypequeryproc = "file -b --mime";
 */
 
 /*
-** This program is usually called directly by users, but it is
-** also invoked by the spost program to process an "Fcc", or by
-** comp/repl/forw/dist to refile a draft message.
-*/
-char *fileproc = NMHBINDIR"/refile";
-
-/*
 ** This is the default program invoked by a "list" or "display" response
 ** at the "What now?" prompt. It will be given the absolute pathname of
 ** the message to show. The string ``show -file'' is most likely what you
@@ -141,27 +130,9 @@ char *defaultpager = "more";
 char *defaulteditor = "vi";
 
 /*
-** This is the delivery program called by send to actually
-** deliver mail to users.  This is the interface to the MTS.
-*/
-char *postproc = NMHBINDIR"/spost";
-
-/*
-** This program is called to remove a message by rmm or refile -nolink.
-** It's usually empty, which means to rename the file to a backup name.
-*/
-char *rmmproc = NULL;
-
-/*
-** This program is usually called by the user's whatnowproc, but it
-** may also be called directly to send a message previously composed.
- */
-char *sendproc = NMHBINDIR"/send";
-
-/*
 ** This program is called after comp, et. al., have built a draft
 */
-char *whatnowproc = NMHBINDIR"/whatnow";
+char *whatnowproc = "whatnow";
 
 /*
 ** This is the sendmail interface to use for sending mail.
@@ -180,7 +151,9 @@ char *mailspool = MAILSPOOL;
 
 /*
 ** The prefix that is prepended to the name of message files when they
-** are "removed" by rmm. This should typically be `,' or `#'.
+** are backup'd for some reason. send, for instance, does this.
+** Note: rmm does NOT anymore use the backup prefix.
+** It should typically be set to `,' or `#'.
 */
 char *backup_prefix = ",";
 
@@ -193,14 +166,13 @@ char *altmsglink = "@";
 /*
 ** Folders (directories) are created with this protection (mode)
 */
-char *foldprot = "700";
+char *foldprot = "0700";
 
 /*
 ** Every NEW message will be created with this protection.  When a
-** message is filed it retains its protection, so this only applies
-** to messages coming in through inc.
+** message is filed it retains its protection.
 */
-char *msgprot = "600";
+char *msgprot = "0600";