Created attachment 95639 [details] [review]
Fix shadowed declarations of socket/read/dup
It seems that has been addressed in the past given the large number of 'NiceSocket *sock' declarations, but recently a large number of shadowing declarations were added. The attached patch fixes the issues I ran into on OpenBSD.
I believe all of these were fixed, please re-open if they weren't.