diff options
| author | sam <sam@FreeBSD.org> | 2005-06-13 16:54:21 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-06-13 16:54:21 +0000 |
| commit | 959b8ed2235be426030cda2be478aef5c8ae7577 (patch) | |
| tree | 84e2f35a5fd905073f385acf15e45382d880b4af /contrib | |
| parent | 848adee197364f7b5192e973348cebe5eb5c5915 (diff) | |
| download | FreeBSD-src-959b8ed2235be426030cda2be478aef5c8ae7577.zip FreeBSD-src-959b8ed2235be426030cda2be478aef5c8ae7577.tar.gz | |
resolve merge conflicts
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/wpa_supplicant/wpa_ctrl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/wpa_supplicant/wpa_ctrl.c b/contrib/wpa_supplicant/wpa_ctrl.c index 8e35116..3c79fc4 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; |
