534fb07b6c
Correct a mis-merge from HEAD, and make sure the socket permissions are set to 0666. Reported by: delphij via rwatson Approved by: re (scottl)