Add a new version of the patch committed in r468197 that fixes a regression
introduced by that version.

PR: 223587
Submitted by: Todd C. Miller <Todd.Miller@sudo.ws>
Reported by: vas@mpeks.tomsk.su
Obtained from: https://bugzilla.sudo.ws/show_bug.cgi?id=831
MFH: 2018Q2
Sponsored by: Rubicon Communications, LLC (Netgate)