[pkg-wpa-devel] r1218 - in /wpasupplicant/trunk: debian/changelog src/rsn_supp/wpa.c wpa_supplicant/wpas_glue.c
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Tue Jul 8 08:49:25 UTC 2008
Author: kelmo-guest
Date: Tue Jul 8 08:49:25 2008
New Revision: 1218
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1218
Log:
Import current git.
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/src/rsn_supp/wpa.c
wpasupplicant/trunk/wpa_supplicant/wpas_glue.c
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1218&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Tue Jul 8 08:49:25 2008
@@ -1,4 +1,4 @@
-wpasupplicant (0.6.4~git20080702.9d6762c-1) UNRELEASED; urgency=low
+wpasupplicant (0.6.4~git20080708.886a807-1) UNRELEASED; urgency=low
* (NOT RELEASED YET) New upstream git snapshot.
* Drop patches applied upstream:
@@ -49,7 +49,7 @@
* Move debian/README.Debian-source to debian/README.source, as policy seem
to prefer this filename now as of version 3.8.0.
- -- Kel Modderman <kel at otaku42.de> Thu, 03 Jul 2008 19:10:57 +1000
+ -- Kel Modderman <kel at otaku42.de> Tue, 08 Jul 2008 18:48:47 +1000
wpasupplicant (0.6.3-2) UNRELEASED; urgency=low
Modified: wpasupplicant/trunk/src/rsn_supp/wpa.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/src/rsn_supp/wpa.c?rev=1218&op=diff
==============================================================================
--- wpasupplicant/trunk/src/rsn_supp/wpa.c (original)
+++ wpasupplicant/trunk/src/rsn_supp/wpa.c Tue Jul 8 08:49:25 2008
@@ -1993,8 +1993,8 @@
if (!sm)
return;
- sm->network_ctx = config;
if (config) {
+ sm->network_ctx = config->network_ctx;
sm->peerkey_enabled = config->peerkey_enabled;
sm->allowed_pairwise_cipher = config->allowed_pairwise_cipher;
sm->proactive_key_caching = config->proactive_key_caching;
@@ -2006,6 +2006,7 @@
} else
sm->ssid_len = 0;
} else {
+ sm->network_ctx = NULL;
sm->peerkey_enabled = 0;
sm->allowed_pairwise_cipher = 0;
sm->proactive_key_caching = 0;
Modified: wpasupplicant/trunk/wpa_supplicant/wpas_glue.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/wpas_glue.c?rev=1218&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/wpas_glue.c (original)
+++ wpasupplicant/trunk/wpa_supplicant/wpas_glue.c Tue Jul 8 08:49:25 2008
@@ -604,6 +604,7 @@
struct rsn_supp_config conf;
if (ssid) {
os_memset(&conf, 0, sizeof(conf));
+ conf.network_ctx = ssid;
conf.peerkey_enabled = ssid->peerkey;
conf.allowed_pairwise_cipher = ssid->pairwise_cipher;
#ifdef IEEE8021X_EAPOL
More information about the Pkg-wpa-devel
mailing list