rc.d/sendmail: Fix the rcorder block
ClosedPublic
Actions

Authored by 0mp on Oct 4 2024, 12:29 PM.

Details

Reviewers

bnovkov
christos
markj
gshapiro

Commits

rGf94127e3ee91: rc.d/sendmail: Fix stopping service during shutdown
rG4fc260561e84: rc.d/sendmail: Fix stopping service during shutdown
rG8751fbe36ff0: rc.d/sendmail: Fix stopping service during shutdown

Summary

rcorder(8) requires the rcorder block to be an uninterrupted sequence of
REQUIRE, PROVIDE, BEFORE, and KEYWORD lines. Having a comment in between
REQUIRE and KEYWORD makes rcorder stop parsing the block when it reaches
the comment. Fix that by moving the comment out from the rcorder block.

MFC after: 3 days

Test Plan

After the patch is applied, rcorder will report sendmail as having the shutdown keyword:

rcorder -k shutdown /etc/rc.d/* | grep sendmail

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 59737
Build 56623: arc lint + arc unit

Event Timeline

0mp created this revision.Oct 4 2024, 12:29 PM

Herald added a subscriber: imp. · View Herald TranscriptOct 4 2024, 12:29 PM

0mp requested review of this revision.Oct 4 2024, 12:29 PM

Harbormaster completed remote builds in B59737: Diff 144226.Oct 4 2024, 12:29 PM

0mp edited the test plan for this revision. (Show Details)Oct 9 2024, 3:16 PM

0mp added reviewers: bnovkov, christos, markj.

0mp added a project: rc.

This seems fine to me. Looks like it's been broken for a rather long time.

What exactly is the effect? Does sendmail actually need the shutdown keyword?

LGTM, approved.

This revision is now accepted and ready to land.Oct 9 2024, 3:20 PM

In D46924#1072046, @markj wrote:

What exactly is the effect? Does sendmail actually need the shutdown keyword?

Yes, to ensure a clean shutdown of active SMTP connections (and writing any in memory queue files).

gshapiro accepted this revision.Oct 9 2024, 10:28 PM

Approved.

In D46924#1072191, @gshapiro wrote:

In D46924#1072046, @markj wrote:

What exactly is the effect? Does sendmail actually need the shutdown keyword?

Yes, to ensure a clean shutdown of active SMTP connections (and writing any in memory queue files).