From 959b8ed2235be426030cda2be478aef5c8ae7577 Mon Sep 17 00:00:00 2001 From: sam Date: Mon, 13 Jun 2005 16:54:21 +0000 Subject: [PATCH] resolve merge conflicts --- contrib/wpa_supplicant/wpa_ctrl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/wpa_supplicant/wpa_ctrl.c b/contrib/wpa_supplicant/wpa_ctrl.c index 8e351164805..3c79fc43c10 100644 --- a/contrib/wpa_supplicant/wpa_ctrl.c +++ b/contrib/wpa_supplicant/wpa_ctrl.c @@ -93,8 +93,7 @@ struct wpa_ctrl * wpa_ctrl_open(const char *ctrl_path) snprintf(ctrl->local.sun_path, sizeof(ctrl->local.sun_path) - 1, "/tmp/wpa_ctrl_%d-%d", getpid(), counter++); if (bind(ctrl->s, (struct sockaddr *) &ctrl->local, - sizeof(ctrl->local.sun_family) + - strlen(ctrl->local.sun_path)) < 0) { + sizeof(ctrl->local)) < 0) { close(ctrl->s); free(ctrl); return NULL; -- 2.45.0