From fe1ae7540841b8bdb7ce7b456189c93a5be80922 Mon Sep 17 00:00:00 2001 From: Robert Love Date: Wed, 15 Feb 2006 21:46:42 +0000 Subject: [PATCH] 2006-02-15 Robert Love * src/nm-device-802-11-wireless.c: Use LOCALSTATEDIR preprocessor define, not an open-coded "/var", for WPA_SUPPLICANT_GLOBAL_SOCKET and WPA_SUPPLICANT_CONTROL_SOCKET. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1476 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/nm-device-802-11-wireless.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89c42c55d9..41f34efdbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-15 Robert Love + + * src/nm-device-802-11-wireless.c: Use LOCALSTATEDIR preprocessor + define, not an open-coded "/var", for WPA_SUPPLICANT_GLOBAL_SOCKET + and WPA_SUPPLICANT_CONTROL_SOCKET. + 2006-02-15 Robert Love * src/nm-device-802-11-wireless.c, src/nm-device.c: When printing debug diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index a6e432b442..a8d37d4fb9 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -2016,8 +2016,8 @@ ap_need_key (NMDevice80211Wireless *self, * Free Software Foundation version 2 of the License. */ -#define WPA_SUPPLICANT_GLOBAL_SOCKET "/var/run/wpa_supplicant-global" -#define WPA_SUPPLICANT_CONTROL_SOCKET "/var/run/wpa_supplicant" +#define WPA_SUPPLICANT_GLOBAL_SOCKET LOCALSTATEDIR"/run/wpa_supplicant-global" +#define WPA_SUPPLICANT_CONTROL_SOCKET LOCALSTATEDIR"/run/wpa_supplicant" static void