Index: Makefile =================================================================== RCS file: /homes/systems/monnier/cvsroot/procmail/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.3 diff -u -r1.1.1.1 -r1.3 Index: config.h =================================================================== RCS file: /homes/systems/monnier/cvsroot/procmail/config.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- config.h 1997/04/28 23:01:24 1.1.1.1 +++ config.h 1997/04/29 00:33:43 1.2 @@ -18,7 +18,7 @@ */ #define KEEPENV {"TZ",0} -/*#define DEFPATH "PATH=$HOME/bin:/bin:/usr/bin" /* uncomment and/or +#define DEFPATH "PATH=$HOME/bin:/bin:/usr/bin:/usr/local/bin" /* uncomment and/or change if you do not want the autoconf generated defPATH setting to be used in PRESTENV below. */ @@ -66,7 +66,12 @@ autoconfigured default SENDMAIL is not suitable */ -#define PROCMAILRC "$HOME/.procmailrc" /* default rcfile for every +#ifdef MAILSPOOLDIR +#undef MAILSPOOLDIR +#endif +#define MAILSPOOLDIR "/var/mail/" /* watch the trailing / */ +#define MAILDIRFILE "/mailbox" /* watch the leading / */ +#define PROCMAILRC "/var/mail/$LOGNAME/procmailrc" /* default rcfile for every recipient; if this file is not found, maildelivery will proceed as normal to the default system mailbox. */ Index: man/Makefile =================================================================== RCS file: /homes/systems/monnier/cvsroot/procmail/man/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.3 diff -u -r1.1.1.1 -r1.3 Index: man/lockfile.man =================================================================== RCS file: /homes/systems/monnier/cvsroot/procmail/man/lockfile.man,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- lockfile.man 1997/04/28 23:01:24 1.1.1.1 +++ lockfile.man 1997/04/29 00:33:48 1.2 @@ -110,7 +110,7 @@ to verify and/or correct the invoker's loginname (and to find out his HOME directory, if needed) .TP -.B @MAILSPOOLDIR@$LOGNAME@DEFlockext@ +.B @MAILSPOOLDIR@$LOGNAME@MAILDIRFILE@@DEFlockext@ lockfile for the system mailbox, the environment variables present in here will not be taken from the environment, but will be determined by looking in /etc/passwd Index: man/procmail.man =================================================================== RCS file: /homes/systems/monnier/cvsroot/procmail/man/procmail.man,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- procmail.man 1997/04/28 23:01:24 1.1.1.1 +++ procmail.man 1997/04/29 00:33:48 1.2 @@ -236,7 +236,7 @@ .B /etc/passwd to set the recipient's LOGNAME, HOME and SHELL variable defaults .TP -.B @MAILSPOOLDIR@$LOGNAME +.B @MAILSPOOLDIR@$LOGNAME@MAILDIRFILE@ system mailbox; both the system mailbox and the immediate directory it is in will be created everytime procmail starts and either one is not present@ETCRC_files@@ETCRCS_files@ @@ -244,9 +244,9 @@ .B @PROCMAILRC@ default rcfile .TP -.B @MAILSPOOLDIR@$LOGNAME@DEFlockext@ +.B @MAILSPOOLDIR@$LOGNAME@MAILDIRFILE@@DEFlockext@ lockfile for the system mailbox (not automatically used by procmail, unless -$DEFAULT equals @MAILSPOOLDIR@$LOGNAME and procmail is delivering to $DEFAULT) +$DEFAULT equals @MAILSPOOLDIR@$LOGNAME@MAILDIRFILE@ and procmail is delivering to $DEFAULT) .TP .B @DEFsendmail@ default mail forwarder @@ -580,7 +580,7 @@ rcfile if it is either owned by the recipient or root and not world writable, or if the directory it is contained in is not world writable. .PP -If @MAILSPOOLDIR@$LOGNAME is a bogus mailbox (i.e. does not belong to the +If @MAILSPOOLDIR@$LOGNAME@MAILDIRFILE@ is a bogus mailbox (i.e. does not belong to the recipient, is unwritable, is a symbolic link or is a hard link), procmail will upon startup try to rename it into a file starting with `@BOGUSprefix@' and ending in an inode-sequence-code. If this turns out to be impossible, @@ -589,7 +589,7 @@ .I no initial value, and hence will inhibit delivery without a proper rcfile. .PP -If @MAILSPOOLDIR@$LOGNAME already is a valid mailbox, but has got too loose +If @MAILSPOOLDIR@$LOGNAME@MAILDIRFILE@ already is a valid mailbox, but has got too loose permissions on it, procmail will correct this. To prevent procmail from doing this make sure the u+x bit is set. .PP @@ -670,7 +670,7 @@ .Sx 17 #!/bin/sh -ORGMAIL=@MAILSPOOLDIR@$LOGNAME +ORGMAIL=@MAILSPOOLDIR@$LOGNAME@MAILDIRFILE@ if cd $HOME && test \-s $ORGMAIL && Index: man/procmailrc.man =================================================================== RCS file: /homes/systems/monnier/cvsroot/procmail/man/procmailrc.man,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- procmailrc.man 1997/04/28 23:01:24 1.1.1.1 +++ procmailrc.man 1997/04/29 00:33:48 1.2 @@ -273,7 +273,7 @@ \&@DEFshellflags@ .TP .BR ORGMAIL -\&@MAILSPOOLDIR@$LOGNAME +\&@MAILSPOOLDIR@$LOGNAME@MAILDIRFILE@ .br (Unless .B \-@MAILFILTOPT@ Index: src/Makefile =================================================================== RCS file: /homes/systems/monnier/cvsroot/procmail/src/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.3 diff -u -r1.1.1.1 -r1.3 Index: src/authenticate.c =================================================================== RCS file: /homes/systems/monnier/cvsroot/procmail/src/authenticate.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- authenticate.c 1997/04/28 23:01:24 1.1.1.1 +++ authenticate.c 1997/04/29 00:33:51 1.2 @@ -38,6 +38,9 @@ #ifndef MAILSPOOLDIR #define MAILSPOOLDIR "/var/spool/mail/" /* watch the trailing / */ #endif +#ifndef MAILDIRFILE +#define MAILDIRFILE "" /* watch the leading / */ +#endif #ifndef MAILSPOOLHASH #define MAILSPOOLHASH 0 /* 2 would deliver to /var/spool/mail/b/a/bar */ #endif @@ -157,8 +160,9 @@ strcpy(pass->mbox+i,mailfile); #else { static const char mailspooldir[]=MAILSPOOLDIR; + static const char maildirfile[]=MAILDIRFILE; if(!(pass->mbox=malloc( - STRLEN(mailspooldir)+MAILSPOOLHASH*2+strlen(pass->pw->pw_name)+1))) + STRLEN(mailspooldir)+MAILSPOOLHASH*2+strlen(pass->pw->pw_name)+STRLEN(maildirfile)+1))) return ""; strcpy(pass->mbox,mailspooldir); ;{ char*p,*n;size_t i;int c; @@ -169,6 +173,8 @@ *p++=c; } strcpy(p,pass->pw->pw_name); + p+=strlen(pass->pw->pw_name); + strcpy(p,maildirfile); } #endif /* MAILSPOOLHOME */ } Index: src/authenticate.h =================================================================== RCS file: /homes/systems/monnier/cvsroot/procmail/src/authenticate.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: src/manconf.c =================================================================== RCS file: /homes/systems/monnier/cvsroot/procmail/src/manconf.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- manconf.c 1997/04/28 23:01:24 1.1.1.1 +++ manconf.c 1997/04/29 00:33:52 1.2 @@ -169,6 +169,7 @@ #else ps("UPPERCASE_USERNAMES",""); #endif + ps("MAILDIRFILE",MAILDIRFILE); ps("MAILSPOOLDIR",MAILSPOOLDIR); ps("ETCRC_desc",etcrc?"\1.PP\1If no rcfiles and no\1.B \2-@PRESERVOPT@\1have\ been specified on the command line, procmail will, prior to reading\