Page MenuHomeFreeBSD
Differential D19530

Followup to PR231977: Mention that /etc/pf.conf must be created first
ClosedPublic
Actions

Authored by bcr on Mar 10 2019, 4:50 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 14, 3:34 PM
Unknown Object (File)
Mon, Apr 14, 2:07 PM
Unknown Object (File)
Sun, Mar 23, 4:15 PM
Unknown Object (File)
Mar 17 2025, 2:00 AM
Unknown Object (File)
Mar 14 2025, 12:53 PM
Unknown Object (File)
Mar 1 2025, 4:26 PM
Unknown Object (File)
Jan 18 2025, 1:18 AM
Unknown Object (File)
Jan 17 2025, 2:47 PM
View All 73 Files
Subscribers
0mp
imp

Details

Reviewers
kp
koobs
Group Reviewers
manpages
Commits
rS345404: MFC r345080:
rS345080: Extend descriptions and comments about the need to create /etc/pf.conf.
Summary

This is a followup change to address PR 231977: we need to mention that /etc/pf.conf does not exist by default.

I'm having a bit of trouble coming up with a proper change/wording in /head/libexec/rc/rc.conf. Removing the line

pf_rules="/etc/pf.conf"         # rules definition file for pf

would be wrong, as it still is the default location for the file, even if it does not exist there by default. What would be a good way to say that in the comment? Something like

pf_rules="/etc/pf.conf"         # rules definition file for pf (nonexistent by default)

maybe?

Test Plan
  1. Apply the patch to share/man/man5/pf.conf.5
  2. See how it looks like: man ./share/man/man5/pf.conf.5

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 22993

Event Timeline

bcr created this revision.Mar 10 2019, 4:50 PM
Herald added a reviewer: manpages. · View Herald TranscriptMar 10 2019, 4:50 PM
Herald added a subscriber: imp. · View Herald Transcript
Harbormaster completed remote builds in B22988: Diff 54897.Mar 10 2019, 4:50 PM
0mp added a subscriber: 0mp.Mar 10 2019, 7:29 PM

pf_rules="/etc/pf.conf" # rules definition file for pf (nonexistent by default)

seems fine.

share/man/man5/pf.conf.5
3056 ↗(On Diff #54897)

How about The file has to be created manually as it is not installed with a standard installation.

bcr updated this revision to Diff 54904.Mar 10 2019, 7:50 PM

Update pf.conf.5 with suggestions from @0mp.

Harbormaster completed remote builds in B22993: Diff 54904.Mar 10 2019, 7:50 PM
kp accepted this revision.Mar 12 2019, 10:07 AM
This revision is now accepted and ready to land.Mar 12 2019, 10:07 AM
Closed by commit rS345080: Extend descriptions and comments about the need to create /etc/pf.conf. (authored by bcr). · Explain WhyMar 12 2019, 8:08 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
4 lines

Diff 54904

View Options

pf.conf.5

Show First 20 Lines • Show All 215 Lines • ▼ Show 20 Linesprocfile(const char *fn)
for (c = 0; c == 0 || !(lflag || qflag); ) { for (c = 0; c == 0 || !(lflag || qflag); ) {
ln.off += ln.len + 1; ln.off += ln.len + 1;
if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) { if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) {
if (ln.line_no == 0 && matchall) if (ln.line_no == 0 && matchall)
exit(0); exit(0);
else else
break; break;
} }
if (ln.len > 0 && ln.dat[ln.len - 1] == '\n') if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol)
--ln.len; --ln.len;
ln.line_no++; ln.line_no++;
/* Return if we need to skip a binary file */ /* Return if we need to skip a binary file */
if (f->binary && binbehave == BINFILE_SKIP) { if (f->binary && binbehave == BINFILE_SKIP) {
grep_close(f); grep_close(f);
free(ln.file); free(ln.file);
free(f); free(f);
▲ Show 20 Lines • Show All 254 Lines • ▼ Show 20 Lines if ((oflag || color) && m > 0) {
} }
if (!oflag) { if (!oflag) {
if (line->len - a > 0) if (line->len - a > 0)
fwrite(line->dat + a, line->len - a, 1, stdout); fwrite(line->dat + a, line->len - a, 1, stdout);
putchar('\n'); putchar('\n');
} }
} else { } else {
fwrite(line->dat, line->len, 1, stdout); fwrite(line->dat, line->len, 1, stdout);
putchar('\n'); putchar(fileeol);
cemUnsubmitted
Not Done
Inline Actions

Hm, should the nul input separater really be used for outputting matched lines?

And if so, shouldn't it also be used with oflag above?

cem: Hm, should the nul input separater really be used for outputting matched lines? And if so…
kevansAuthorUnsubmitted
Not Done
Inline Actions

So, it depends. If we're supposed to be printing the matched lines, we need to do so faithful to the input file -- i.e., this line, and actually line 491 that I missed (!oflag, but color). Everything else is printing excerpts and should use the standard grep newline separator.

kevans: So, it depends. If we're supposed to be printing the matched lines, we need to do so faithful…
} }
} }