Package: network-manager-kde Version: 1:0.2-2 Severity: minor Tags: patch Hey kids,
I've just switched to network manager to make dealing with a poor wireless
signal a little less painful. When the association fails, network manager
assumes I have provided the wrong key and prompts me for a new one. I know I
have the correct key and just want it to try again but it fails to notice
that the WEP key I have entered is in HEX format, rather than PASSPHRASE.
The "Encryption" combo-box therefore defaults to passphrase and I have to
change it manually before continuing.
I have attached a patch which might fix this. It's _completely_untested_ as
network-manager-kde currently depends on an obsolete version of libnl.
I hope that's clear and reproducible (entering the wrong key in anything other
than "passphrase" should produce the same behaviour)! It would be great if
someone could confirm my patch does the job.
Thanks,
Bruce
--- System information. ---
Architecture: amd64
Kernel: Linux 2.6.24-rc6
Debian Release: lenny/sid
500 unstable www.debian-multimedia.org
500 unstable ftp.de.debian.org
500 stable www.debian-multimedia.org
1 experimental ftp.de.debian.org
--- Package information. ---
Depends (Version) | Installed
===========================================-+-=======================
kdelibs4c2a (>= 4:3.5.7-1) | 4:3.5.8.dfsg.1-4
libc6 (>= 2.6.1-1) | 2.7-5
libdbus-1-3 (>= 1.1.1) | 1.1.2-1
libdbus-qt-1-1c2 (>= 0.62.git.20060814) | 0.62.git.20060814-2
libgcc1 (>= 1:4.2.1) | 1:4.2.2-4
libglib2.0-0 (>= 2.14.0) | 2.14.4-2
libhal1 (>= 0.5.9) | 0.5.10-5
libice6 (>= 1:1.0.0) | 2:1.0.4-1
libnl1-pre6 | 1.0~pre6-6
libnm-util0 | 0.6.5-4
libpng12-0 (>= 1.2.13-4) | 1.2.15~beta5-3
libqt3-mt (>= 3:3.3.7) | 3:3.3.7-9
libsm6 | 2:1.0.3-1+b1
libstdc++6 (>= 4.2.1) | 4.2.2-4
libx11-6 | 2:1.0.3-7
libxext6 | 1:1.0.3-2
zlib1g (>= 1:1.2.3.3.dfsg-1) | 1:1.2.3.3.dfsg-8
network-manager (>= 0.6.2) | 0.6.5-3
diff -Naur knetworkmanager.old/knetworkmanager-0.2/knetworkmanager/src/knetworkmanager-dialogfab.cpp knetworkmanager/knetworkmanager-0.2/knetworkmanager/src/knetworkmanager-dialogfab.cpp
--- knetworkmanager.old/knetworkmanager-0.2/knetworkmanager/src/knetworkmanager-dialogfab.cpp 2007-12-27 22:47:23.000000000 +0000
+++ knetworkmanager/knetworkmanager-0.2/knetworkmanager/src/knetworkmanager-dialogfab.cpp 2007-12-27 22:43:20.000000000 +0000
@@ -126,7 +126,7 @@
_encryptionMap [_id_wep_ascii] = new EncryptionWEP (WEP_ASCII);
//cryptoWidget->stackEncAdvanced->raiseWidget (cryptoWidget->advancedWEPWidget);
- comboEnc->setCurrentItem (_id_wep_passphrase);
+ comboEnc->setCurrentItem (encryption->getType ());
} else if ((capabilities & NM_802_11_CAP_PROTO_WPA) || (capabilities & NM_802_11_CAP_PROTO_WPA2)) {
QComboBox* comboProto = cryptoWidget->comboProtocol;
int protoId = 0;
diff -Naur knetworkmanager.old/knetworkmanager-0.2/knetworkmanager/src/knetworkmanager-encryption.cpp knetworkmanager/knetworkmanager-0.2/knetworkmanager/src/knetworkmanager-encryption.cpp
--- knetworkmanager.old/knetworkmanager-0.2/knetworkmanager/src/knetworkmanager-encryption.cpp 2007-12-27 22:46:47.000000000 +0000
+++ knetworkmanager/knetworkmanager-0.2/knetworkmanager/src/knetworkmanager-encryption.cpp 2007-12-27 22:42:31.000000000 +0000
@@ -343,6 +343,12 @@
}
void
+EncryptionWEP::getType( void )
+{
+ return _type;
+}
+
+void
EncryptionWEP::setDefaults ()
{
setMethod (WEP_OPEN_SYSTEM);
diff -Naur knetworkmanager.old/knetworkmanager-0.2/knetworkmanager/src/knetworkmanager-encryption.h knetworkmanager/knetworkmanager-0.2/knetworkmanager/src/knetworkmanager-encryption.h
--- knetworkmanager.old/knetworkmanager-0.2/knetworkmanager/src/knetworkmanager-encryption.h 2007-12-27 22:47:08.000000000 +0000
+++ knetworkmanager/knetworkmanager-0.2/knetworkmanager/src/knetworkmanager-encryption.h 2007-12-27 22:41:59.000000000 +0000
@@ -138,6 +138,7 @@
void setMethod (WEPMethod);
WEPMethod getMethod (void);
void setType( WEPType );
+ WEPType getType (void);
bool serialize (DBusMessage*, const QString &);
virtual bool deserialize( DBusMessageIter *, int we_cipher );
smime.p7s
Description: S/MIME cryptographic signature
