1 diff -Nur old/courier/courierd.dist.in new/courier/courierd.dist.in
2 --- old/courier/courierd.dist.in 2002-03-15 19:17:18.000000000 +0000
3 +++ new/courier/courierd.dist.in 2004-08-02 16:55:29.000000000 +0000
5 # One of the following definitions of DEFAULTDELIVERY should be
8 -# Default deliveries to $HOME/Maildir
9 +# Default deliveries to $HOME/Mail/Maildir
11 -# DEFAULTDELIVERY=./Maildir
12 +# DEFAULTDELIVERY=./Mail/Maildir
14 # Alternatively, use procmail to deliver mail to local mailboxes.
17 # use something like this:
19 # DEFAULTDELIVERY="|| dotforward
23 # Yes, it's two lines long, with an embedded newline. Of course, you can use
24 # any default local mail delivery instruction in place of ./Maildir.
26 -DEFAULTDELIVERY=./Maildir
27 +DEFAULTDELIVERY=./Mail/Maildir
29 ##NAME: MAILDROPDEFAULT:0
32 # the location of the default mailbox. You should not change this setting
33 # unless you REALLY know what you're doing.
35 -MAILDROPDEFAULT=./Maildir
36 +MAILDROPDEFAULT=./Mail/Maildir
40 diff -Nur old/courier/imapd.rc.in new/courier/imapd.rc.in
41 --- old/courier/imapd.rc.in 2003-11-29 02:16:15.000000000 +0000
42 +++ new/courier/imapd.rc.in 2004-02-20 12:25:45.000000000 +0000
44 -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
45 -pid=$PIDFILE $TCPDOPTS \
46 $PORT @libexecdir@/courier/imaplogin $LIBAUTHMODULES \
47 - @bindir@/imapd Maildir"
48 + @bindir@/imapd Mail/Maildir"
51 @sbindir@/couriertcpd -pid=$PIDFILE -stop
52 diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in
53 --- old/courier/imapd-ssl.rc.in 2003-11-29 02:16:15.000000000 +0000
54 +++ new/courier/imapd-ssl.rc.in 2004-02-20 12:25:45.000000000 +0000
56 -pid=$SSLPIDFILE $TCPDOPTS \
57 $SSLPORT $COURIERTLS -server -tcpd \
58 @libexecdir@/courier/imaplogin $LIBAUTHMODULES \
59 - @bindir@/imapd Maildir"
60 + @bindir@/imapd Mail/Maildir"
63 @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
64 diff -Nur old/courier/pop3d.in new/courier/pop3d.in
65 --- old/courier/pop3d.in 2003-11-28 01:04:59.000000000 +0000
66 +++ new/courier/pop3d.in 2004-02-20 12:25:45.000000000 +0000
68 -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
69 -pid=$PIDFILE $TCPDOPTS -address=$ADDRESS $PORT \
70 @libexecdir@/courier/courierpop3login $AUTHMODULELIST \
71 - @libexecdir@/courier/courierpop3d Maildir"
72 + @libexecdir@/courier/courierpop3d Mail/Maildir"
73 diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in
74 --- old/courier/pop3d-ssl.in 2003-11-29 01:37:34.000000000 +0000
75 +++ new/courier/pop3d-ssl.in 2004-02-20 12:25:45.000000000 +0000
77 -pid=$SSLPIDFILE $TCPDOPTS \
78 $SSLPORT $COURIERTLS -server -tcpd \
79 $libexecdir/courier/courierpop3login $LIBAUTHMODULES \
80 - $libexecdir/courier/courierpop3d Maildir"
81 + $libexecdir/courier/courierpop3d Mail/Maildir"
84 @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
85 diff -Nur old/imap/imapd.dist.in new/imap/imapd.dist.in
86 --- old/imap/imapd.dist.in 2004-01-25 05:40:04.000000000 +0000
87 +++ new/imap/imapd.dist.in 2004-03-16 17:45:49.000000000 +0000
90 # MAILDIRPATH - directory name of the maildir directory.
93 +MAILDIRPATH=Mail/Maildir
94 diff -Nur old/imap/imapd-ssl.dist.in new/imap/imapd-ssl.dist.in
95 --- old/imap/imapd-ssl.dist.in 2004-06-26 15:09:58.000000000 +0000
96 +++ new/imap/imapd-ssl.dist.in 2004-08-02 16:10:12.000000000 +0000
99 # MAILDIRPATH - directory name of the maildir directory.
102 +MAILDIRPATH=Mail/Maildir
103 diff -Nur old/imap/pop3d.dist.in new/imap/pop3d.dist.in
104 --- old/imap/pop3d.dist.in 2004-01-25 05:40:04.000000000 +0000
105 +++ new/imap/pop3d.dist.in 2004-03-16 17:45:56.000000000 +0000
108 # MAILDIRPATH - directory name of the maildir directory.
111 +MAILDIRPATH=Mail/Maildir
112 diff -Nur old/imap/pop3d-ssl.dist.in new/imap/pop3d-ssl.dist.in
113 --- old/imap/pop3d-ssl.dist.in 2004-06-26 15:09:59.000000000 +0000
114 +++ new/imap/pop3d-ssl.dist.in 2004-08-02 16:10:20.000000000 +0000
117 # MAILDIRPATH - directory name of the maildir directory.
120 +MAILDIRPATH=Mail/Maildir
121 diff -Nur old/pcp/pcpd.c new/pcp/pcpd.c
122 --- old/pcp/pcpd.c 2004-05-02 14:59:42.000000000 +0000
123 +++ new/pcp/pcpd.c 2004-05-20 15:55:56.000000000 +0000
124 @@ -2187,10 +2187,10 @@
128 - if (chdir(a->maildir && *a->maildir ? a->maildir:"Maildir") < 0)
129 + if (chdir(a->maildir && *a->maildir ? a->maildir:"Mail/Maildir") < 0)
132 - fprintf(stderr, "NOTICE: chdir(Maildir) failed: %s\n",
133 + fprintf(stderr, "NOTICE: chdir(Mail/Maildir) failed: %s\n",
135 maildir_cache_cancel();
137 diff -Nur old/webmail/auth.c new/webmail/auth.c
138 --- old/webmail/auth.c 2004-05-09 03:33:22.000000000 +0000
139 +++ new/webmail/auth.c 2004-05-20 15:54:25.000000000 +0000
141 if (!maildir || !*maildir)
142 maildir=getenv("MAILDIRPATH");
143 if (!maildir || !*maildir)
145 + maildir="Mail/Maildir";
146 if (chdir(maildir)) return (-1);
150 struct stat stat_buf;
152 if (!p || !*p) p=getenv("MAILDIRPATH");
153 - if (!p || !*p) p="Maildir";
154 + if (!p || !*p) p="Mail/Maildir";
156 buf=malloc(strlen(h)+strlen(p)+sizeof(PASSFILE)+100);
158 diff -Nur old/webmail/sqwebmaild.dist.in new/webmail/sqwebmaild.dist.in
159 --- old/webmail/sqwebmaild.dist.in 2004-05-09 03:33:22.000000000 +0000
160 +++ new/webmail/sqwebmaild.dist.in 2004-05-28 10:50:17.000000000 +0000
163 # MAILDIRPATH - directory name of the maildir directory.
166 +MAILDIRPATH=Mail/Maildir
168 ##NAME: AUTHMODULES:0
170 diff -Nur old/webmail/sqwebmail.h new/webmail/sqwebmail.h
171 --- old/webmail/sqwebmail.h 2004-02-29 20:50:13.000000000 +0000
172 +++ new/webmail/sqwebmail.h 2004-04-15 10:58:47.000000000 +0000
175 /* Location of the user's Maildir */
177 -#define USER_DIR "Maildir"
178 +#define USER_DIR "Mail/Maildir"
180 /* For PAM-based authentication */