diff --git a/console-socket.c b/console-socket.c
index 792ca62..e78cfe0 100644
--- a/console-socket.c
+++ b/console-socket.c
@@ -27,18 +27,16 @@
 
 #define CONSOLE_SOCKET_PREFIX "obmc-console"
 
-ssize_t console_socket_path(struct sockaddr_un *addr, const char *id)
+/* Build the socket path. */
+ssize_t console_socket_path(socket_path_t sun_path, const char *id)
 {
-	char *sun_path;
 	ssize_t rc;
 
-	sun_path = (char *)addr + sizeof(*addr) - sizeof(addr->sun_path);
-
 	if (id) {
-		rc = snprintf(sun_path + 1, sizeof(addr->sun_path) - 1,
+		rc = snprintf(sun_path + 1, sizeof(socket_path_t) - 1,
 			      CONSOLE_SOCKET_PREFIX ".%s", id);
 	} else {
-		rc = snprintf(sun_path + 1, sizeof(addr->sun_path) - 1,
+		rc = snprintf(sun_path + 1, sizeof(socket_path_t) - 1,
 			      CONSOLE_SOCKET_PREFIX);
 	}
 
@@ -46,7 +44,7 @@
 		return rc;
 	}
 
-	if ((size_t)rc > (sizeof(addr->sun_path) - 1)) {
+	if ((size_t)rc > (sizeof(socket_path_t) - 1)) {
 		errno = 0;
 		return -1;
 	}