Page MenuHomeFreeBSD

blacklist: update to NetBSD snapshot on 20191106
ClosedPublic

Authored by emaste on Wed, Nov 6, 2:14 PM.

Details

Diff Detail

Repository
rS FreeBSD src repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

emaste created this revision.Wed, Nov 6, 2:14 PM
emaste added inline comments.Wed, Nov 6, 2:18 PM
bin/blacklistd.c
411 ↗(On Diff #63996)

This comes from

commit 242b97578c81b692aa9e7edff06a4128b58708ef
Author: christos <christos@NetBSD.org>
Date:   Wed Feb 27 02:20:18 2019 +0000

    Instead of deleting the rules individually use flush to kill them all at
    once for efficiently. Also when restoring, don't nuke the database
    (Phil Rulon).
diff/ssh.diff
31–35 ↗(On Diff #63996)

from

commit 828ba5364df6fe3b6fe72cd7fe506d3b47f5b2d9
Author: christos <christos@NetBSD.org>
Date:   Mon Jun 26 17:12:05 2017 +0000

    amend the patch to close.
cem added a subscriber: cem.Wed, Nov 6, 3:54 PM

Carrying around an openssh patch is far from ideal. Is there any chance it can be upstreamed?

The star changes look functionally fine.

I didn't look closely at the side effects / context of flush/restore changes. Nor ssh changes.

bin/support.c
105–117 ↗(On Diff #63996)

This is sure to produce wrong results. I guess it's fine if we're just using this to print durations?

emaste added a comment.Wed, Nov 6, 4:08 PM

Carrying around an openssh patch is far from ideal. Is there any chance it can be upstreamed?

Agreed. The patch isn't actually used in our build, it's just extra stuff being carried around. At first I'm just trying to sync up with NetBSD, and we can look at improving things from there.

bin/support.c
105–117 ↗(On Diff #63996)

I guess, it's less wrong than before anyway :)

This revision was not accepted when it landed; it landed in state Needs Review.Wed, Nov 6, 4:22 PM
This revision was automatically updated to reflect the committed changes.
bcr added a subscriber: bcr.Wed, Nov 6, 4:41 PM

Grammar suggestion for the man page.

head/contrib/blacklist/bin/blacklistd.conf.5
39

"files contains" sounds not right. I guess "contain" is better.

emaste added inline comments.Wed, Nov 6, 4:59 PM
head/contrib/blacklist/bin/blacklistd.conf.5
39

Or even "file contains"