diff options
| author | Igor Sobrado <sobrado@cvs.openbsd.org> | 2009-12-16 20:42:27 +0000 |
|---|---|---|
| committer | Igor Sobrado <sobrado@cvs.openbsd.org> | 2009-12-16 20:42:27 +0000 |
| commit | 19afedf6388bbbeefa92130e6116b5b82e6bc7a0 (patch) | |
| tree | 595070db844795b9a6f07af58879403f44b034ca /usr.sbin | |
| parent | 5249a3210eddf6176c4e2e6cbbc570f1b71927c7 (diff) | |
enforce less restrictive limits to mailbox sizes and improve message
reported on failure conditions; increasing the maximum number of
messages is not required, as the number of messages stored on
mailboxes has not grown over the years as much as the size of their
attachments.
miod@ has observed that the message reported was too obscure.
"this can go in" deraadt@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/popa3d/params.h | 6 | ||||
| -rw-r--r-- | usr.sbin/popa3d/pop_trans.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/popa3d/params.h b/usr.sbin/popa3d/params.h index daa2b3260f6..f9949d45be1 100644 --- a/usr.sbin/popa3d/params.h +++ b/usr.sbin/popa3d/params.h @@ -1,4 +1,4 @@ -/* $OpenBSD: params.h,v 1.8 2003/05/12 19:28:22 camield Exp $ */ +/* $OpenBSD: params.h,v 1.9 2009/12/16 20:42:26 sobrado Exp $ */ /* * Global POP daemon parameters. @@ -134,8 +134,8 @@ * a single huge mailbox from stopping the entire POP service. */ #define MAX_MAILBOX_MESSAGES 200000 -#define MAX_MAILBOX_OPEN_BYTES 200000000 -#define MAX_MAILBOX_WORK_BYTES 250000000 +#define MAX_MAILBOX_OPEN_BYTES 2000000000 +#define MAX_MAILBOX_WORK_BYTES 2500000000 #if !VIRTUAL_ONLY diff --git a/usr.sbin/popa3d/pop_trans.c b/usr.sbin/popa3d/pop_trans.c index af5a5b13067..143133d7a49 100644 --- a/usr.sbin/popa3d/pop_trans.c +++ b/usr.sbin/popa3d/pop_trans.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pop_trans.c,v 1.4 2003/05/12 19:28:22 camield Exp $ */ +/* $OpenBSD: pop_trans.c,v 1.5 2009/12/16 20:42:26 sobrado Exp $ */ /* * TRANSACTION state handling. @@ -212,7 +212,7 @@ int do_pop_trans(char *spool, char *mailbox) if (db_load(spool, mailbox)) { syslog(SYSLOG_PRI_HI, - "Failed or refused to load %s/%s", + "Failure reading %s/%s or mailbox limits exceeded", spool, mailbox); pop_reply_error(); return 0; |