John Peacock
9cbf206a4a
* lib/Qpsmtpd/TcpServer.pm
...
Don't try to load the plugins if they are already loaded.
* lib/Qpsmtpd/Transaction.pm
Get the size_threshold by inheritance.
Extract the spooling of the body as a new sub.
Always spool the body when calling body_filename().
Compare the body_size to the cached size_threshold.
* lib/Qpsmtpd.pm
Cache the size_threshold and provide an accessor method.
* qpsmtpd-forkserver
Initialize both the spool_dir and size_threshold caches before forking.
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@547 958fd67b-6ff1-0310-b445-bb7760255be9
2005-09-22 17:14:20 +00:00
Devin Carraway
22fef51c19
Detaint %ENV somewhat more thoroughly (derived from perl5.8.7 perlsec POD).
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@545 958fd67b-6ff1-0310-b445-bb7760255be9
2005-08-26 09:51:57 +00:00
Ask Bjørn Hansen
87baf0fbf1
yay for 4 space indentation (but let's not run this until post 0.31)
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@543 958fd67b-6ff1-0310-b445-bb7760255be9
2005-08-16 04:57:03 +00:00
Matt Sergeant
0d8d9f03b8
Merge from trunk r540:541
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@542 958fd67b-6ff1-0310-b445-bb7760255be9
2005-08-15 18:43:19 +00:00
Matt Sergeant
79ecf24218
Fix for tls enabling auth - this is kind of hacky, and I'd prefer to fix
...
this nastiness in the auth support instead. But this works for now.
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@541 958fd67b-6ff1-0310-b445-bb7760255be9
2005-08-15 17:58:41 +00:00
Devin Carraway
ff4c5d1ff2
Merge r536 from 0.31 branch (silence uninitialized-value warning on zero-length PID file)
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@540 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-31 09:02:42 +00:00
Devin Carraway
4a6f5dd2f0
Merge r529 from 0.31 branch (explicit config dir via $QPSMTPD_CONFIG).
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@539 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-31 08:48:04 +00:00
Devin Carraway
4cdae6bf05
Merge daemonization support from 0.31 branch. Removed its -d commandline
...
switch since the debug switch is already using it.
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@538 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-31 08:42:43 +00:00
Devin Carraway
6f23c46e93
Generalize '$include' support from plugin configuration to cover all config
...
calls. Add circular-reference checking.
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@537 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-31 05:54:36 +00:00
Devin Carraway
da5c0a74fe
Fix unitialized-value warning if the PID file existed but was zero-length
...
at startup time.
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@536 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-30 09:32:36 +00:00
Devin Carraway
bde5a3fef9
Merge r534 from trunk (caution about using large wait times in
...
check_earlytalker)
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@535 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-30 07:22:13 +00:00
Devin Carraway
8bb7cf67de
Add a caution about using large wait times in check_earlytalker; some
...
superficial research suggests that some MTAs have unexpectedly short timeouts
waiting for SMTP greetings (default of 30sec for Exim4.5, most notably)
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@534 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-30 07:19:17 +00:00
Matt Sergeant
9d6faa39cb
Migrate transaction(), reset_transaction() and connection() up to Qpsmtpd.pm
...
Minor bug fix for auth capability
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@533 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-29 18:05:08 +00:00
Matt Sergeant
72a3056e66
Default capabilities to an empty arrayref
...
Copy relay_client setting when cloning connection in tls
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@532 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-29 18:02:07 +00:00
Devin Carraway
347ce0dd0c
Mention exim-bsmtp plugin in changelog
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@531 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-29 08:10:35 +00:00
Devin Carraway
81f71b4a88
Mention --detach in changelog
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@530 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-29 08:08:51 +00:00
Devin Carraway
deb3380d06
Apply slight variation on patch from Peter Holzer to allow specification of
...
an explicit $QPSMTPD_CONFIG variable to specify where the config lives,
overriding $QMAIL/control and /var/qmail/control if set. The usual "last
location with the file wins" rule still applies.
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@529 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-29 08:05:42 +00:00
Devin Carraway
a9bb35d180
Enable svn:keywords
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@528 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-29 07:41:54 +00:00
Devin Carraway
26bc3e25b8
Import Exim BSMTP queue plugin, updated to 0.31 API
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@527 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-29 07:41:10 +00:00
Devin Carraway
a4e4c5217c
Fix whitespace (spaces for a tab)
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@526 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-29 07:24:04 +00:00
Devin Carraway
00e06cc612
Remove PID file on exit, if we were told to create one with --pid-file
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@525 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-29 07:22:36 +00:00
Devin Carraway
a2064bc22e
Add --detach commandline option to forkserver; if supplied, daemonize just
...
prior to entering the main accept loop.
Split handling of --pid-file so that preexisting pid files are dealt with and
the file is opened before priveleges are dropped, but the writing out of the
new file happens after dropping privs and (if applicable) forking the
daemonized process, so the correct PID is recorded.
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@524 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-29 06:42:00 +00:00
Devin Carraway
a3ff03fec9
Merge r493 from trunk to truncate PID file before re-use
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@523 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-29 06:21:02 +00:00
John Peacock
ea28e88fa6
Extend require_resolvable_fromhost to include a configurable list of
...
"impossible" addresses to combat spammer forging. (Hanno Hecker)
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@522 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-28 20:25:54 +00:00
Ask Bjørn Hansen
37fb26af81
my suggestion for a .perltidyrc. I tried it on a few files and it
...
cleaned up more than it changed.
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@520 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-23 11:11:32 +00:00
Matt Sergeant
006f129c21
Merge in a bunch of changes from Bradfitz's Danga::Socket 1.40-1.43
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@519 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-19 15:37:14 +00:00
John Peacock
58f7129ada
[merge from trunk] Use qmail/control/smtpdgreeting if it exists, otherwise
...
show the original qpsmtpd greeting (with version information).
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@518 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-19 14:20:05 +00:00
Robert Spier
96ff5e1082
r521@bear: rspier | 2005-07-19T03:24:18.553459Z
...
MANIFEST update from steve peters
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@517 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-19 03:24:42 +00:00
Matt Sergeant
820a3bcb2b
return DECLINED for bad_ssl
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@516 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-18 12:51:57 +00:00
Matt Sergeant
7edb1fd93a
Fix "no pseudo hash" bug
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@515 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-18 12:50:35 +00:00
John Peacock
a69b2e1526
[merge from trunk] Missed hook to data_post to add headers
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@514 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-18 11:13:17 +00:00
John Peacock
f096f293c1
Missed hook to data_post to add headers
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@513 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-18 11:10:11 +00:00
John Peacock
5f3c2dfa22
Missed hook to data_post to add headers
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@512 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-18 11:07:18 +00:00
John Peacock
43aef48532
Correctly handle the case where smtpgreeting exists (append ESMTP) as well as
...
the case where it doesn't (display original Qpsmtpd greeting).
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@511 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-18 00:36:49 +00:00
Matt Sergeant
e8a9828e4e
Notice /var/qmail/control dir (Joe Schaefer)
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@510 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-15 21:15:44 +00:00
Matt Sergeant
162cf7d132
Notice /var/qmail/control dir (Joe Schaefer)
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@509 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-15 21:13:49 +00:00
John Peacock
3096164159
Support smtpgreeting file from qmail/control
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@508 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-15 10:35:23 +00:00
Matt Sergeant
2ca6e9d192
MERGE 503:505 FROM https://svn.perl.org/qpsmtpd/branches/0.31
...
Fix test failures due to hook renames
Fix redefined warnings due to hook renames
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@507 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-14 13:31:07 +00:00
Matt Sergeant
bcbe2ac25f
Don't do exists() on a method call
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@506 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-14 13:25:48 +00:00
John Peacock
3707751b42
This fixes the redefined warnings.
...
All plugins don't have register() any more, but they all have plugin_name().
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@505 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-14 11:05:11 +00:00
John Peacock
bfd72e8ade
Fix test failures due to hook renames
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@504 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-14 10:38:11 +00:00
John Peacock
35f45f208b
These changes to trunk were missed when 0.31 was branched.
...
r588@jpeacock (orig r490): jpeacock | 2005-07-09 07:03:53 -0400
r547@jpeacock: jpeacock | 2005-07-02 07:20:17 -0400
Replace pithy comment with something more neutral.
Thanks Gordon Rowell <gordonr@gormand.com.au>
r548@jpeacock: jpeacock | 2005-07-02 07:24:21 -0400
Example patterns for badrcptto plugin - Gordon Rowell <gordonr@gormand.com.au>
r586@jpeacock: jpeacock | 2005-07-09 06:54:47 -0400
Don't use varlog() directly unless you are passing all parameters.
Don't try to log() anything during loading of logging plugins.
r587@jpeacock: jpeacock | 2005-07-09 06:59:57 -0400
Cannot use new-style hooking with logging plugins (yet).
r590@jpeacock (orig r491): jpeacock | 2005-07-10 06:56:55 -0400
r589@jpeacock: jpeacock | 2005-07-10 06:54:32 -0400
Track hooks as array and hash.
Re-revert changes to logging plugins to use new-style hooking.
logging/adaptive assumed that register() has been called before hook_logging.
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@503 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-14 02:31:01 +00:00
Matt Sergeant
51f1f32928
Fix for forkserver breakage
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@501 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-13 17:10:38 +00:00
Matt Sergeant
f0b31cbb9b
MERGE 498:499 FROM https://svn.perl.org/qpsmtpd/trunk
...
Better fix for pipe being closed bug
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@500 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-12 22:14:48 +00:00
Matt Sergeant
e100e3d67a
Better fix for previous bug
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@499 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-12 21:59:30 +00:00
Matt Sergeant
54cff7af40
When setting OtherFds, always make it an addition to what's already set
...
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@498 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-12 20:40:32 +00:00
Matt Sergeant
e407e8b470
MERGE r386:r480 FROM https://svn.perl.org/qpsmtpd/branches/high_perf
...
High perf branch merge and fixes
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@497 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-11 19:11:11 +00:00
Matt Sergeant
9683016276
MERGE r386:r480 FROM https://svn.perl.org/qpsmtpd/branches/high_perf
...
High perf branch merge and fixes
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@496 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-11 19:10:49 +00:00
Matt Sergeant
11da7e2778
Work around race condition (not fixed, but mostly fixed)
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@495 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-11 16:00:03 +00:00
Matt Sergeant
8c018d75ac
Pass args to unrecognized_command
...
git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@494 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-11 12:24:26 +00:00