This patch totally breaks xhost +SI:localuser: for local sockets addr never gets set but siAddrMatch doesn't care about addr having a value it should be safe against it. I'll probably follow up with a patch once I've tested it. Dave.