Support the up and coming dhcpcd-9.

Author: rsmarples

src/libdhcpcd/dhcpcd.c

@@ -1020,10 +1020,18 @@ dhcpcd_open(DHCPCD_CONNECTION *con, bool privileged)
 		errno = EISCONN;
 		return -1;
 	}
+
 	/* We need to block the command fd */
 	con->command_fd = dhcpcd_connect(path, 0);
-	if (con->command_fd == -1)
-		goto err_exit;
+	if (con->command_fd == -1) {
+		if (errno == ENOENT) {
+			path = privileged ?
+			    DHCPCD_OSOCKET : DHCPCD_UNPRIV_OSOCKET;
+			con->command_fd = dhcpcd_connect(path, 0);
+		}
+		if (con->command_fd == -1)
+			goto err_exit;
+	}
 
 	con->terminate_commands = false;
 	if (dhcpcd_ctrl_command(con, "--version", &con->version) <= 0)

src/libdhcpcd/dhcpcd.h

@@ -37,10 +37,16 @@ extern "C" {
 #endif
 
 #ifndef DHCPCD_SOCKET
-#define DHCPCD_SOCKET		"/var/run/dhcpcd.sock"
+#define DHCPCD_SOCKET		"/var/run/dhcpcd/sock"
 #endif
 #ifndef DHCPCD_UNPRIV_SOCKET
-#define DHCPCD_UNPRIV_SOCKET	"/var/run/dhcpcd.unpriv.sock"
+#define DHCPCD_UNPRIV_SOCKET	"/var/run/dhcpcd/unpriv.sock"
+#endif
+#ifndef DHCPCD_OSOCKET
+#define DHCPCD_OSOCKET		"/var/run/dhcpcd.sock"
+#endif
+#ifndef DHCPCD_UNPRIV_OSOCKET
+#define DHCPCD_UNPRIV_OSOCKET	"/var/run/dhcpcd.unpriv.sock"
 #endif
 
 #ifndef WPA_CTRL_DIR