am 3ac95481: Merge "Fix sockaddr_un length calculation"

* commit '3ac9548103b09c043ba534b4c27207e0d1994149':
  Fix sockaddr_un length calculation