Attachment 56549 Details for Bug 132468

[patch] patch to avoid kmail's passwords usability nightmare

kmail-dontwantwallet.diff (text/plain), 2.63 KB, created by Forgotten User XG9X5w8kVa on 2005-11-05 13:47:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Forgotten User XG9X5w8kVa

Created: 2005-11-05 13:47:52 UTC

Size: 2.63 KB

patch

obsolete

>--- kmail/networkaccount.cpp	2005-05-23 14:11:54.000000000 +0200
>+++ kmail/networkaccount.cpp	2005-06-04 23:30:26.253970455 +0200
>@@ -156,8 +156,9 @@
> 
>       if ( !encpasswd.isEmpty() ) {
>         setPasswd( decryptStr( encpasswd ), true );
>+        mStorePasswdInConfig = config.readBoolEntry( "store-passwd-in-config", false );
>         // migrate to KWallet if available
>-        if ( Wallet::isEnabled() ) {
>+        if ( Wallet::isEnabled() && (!mStorePasswdInConfig)) {
>           config.deleteEntry( "pass" );
>           config.deleteEntry( "passwd" );
>           mPasswdDirty = true;
>@@ -198,7 +199,7 @@
>     if ( storePasswd() ) {
>       // write password to the wallet if possbile and necessary
>       bool passwdStored = false;
>-      if ( mPasswdDirty ) {
>+      if (( mPasswdDirty ) && ( !mStorePasswdInConfig )) {
>         Wallet *wallet = kmkernel->wallet();
>         if ( wallet && wallet->writePassword( "account-" + QString::number(mId), passwd() ) == 0 ) {
>           passwdStored = true;
>@@ -225,6 +226,7 @@
>            == KMessageBox::Yes ) ) {
>         config.writeEntry( "pass", encryptStr( passwd() ) );
>         mStorePasswdInConfig = true;
>+        config.writeEntry( "store-passwd-in-config", mStorePasswdInConfig );
>       }
>     }
> 
>--- kmail/kmtransport.cpp	2005-05-23 14:11:54.000000000 +0200
>+++ kmail/kmtransport.cpp	2005-06-04 23:30:08.532614046 +0200
>@@ -80,6 +80,7 @@
>   authType = config->readEntry("authtype");
>   auth = config->readBoolEntry("auth");
>   mStorePasswd = config->readBoolEntry("storepass");
>+  mStorePasswdInConfig = config->readBoolEntry("storepassinconfig",false);
>   specifyHostname = config->readBoolEntry("specifyHostname", false);
>   localHostname = config->readEntry("localHostname");
> 
>@@ -88,7 +89,7 @@
> 
>   if ( !mPasswd.isEmpty() ) {
>     // migration to kwallet if available
>-    if ( Wallet::isEnabled() ) {
>+    if (( Wallet::isEnabled() )&&(!mStorePasswdInConfig)) {
>       config->deleteEntry( "pass" );
>       mPasswdDirty = true;
>       mStorePasswdInConfig = false;
>@@ -126,7 +127,7 @@
>   if ( storePasswd() ) {
>     // write password into the wallet if possible and necessary
>     bool passwdStored = false;
>-    if ( mPasswdDirty ) {
>+    if (( mPasswdDirty ) && ( !mStorePasswdInConfig )) {
>       Wallet *wallet = kmkernel->wallet();
>       if ( wallet && wallet->writePassword( "transport-" + QString::number(mId), passwd() ) == 0 ) {
>         passwdStored = true;
>@@ -152,6 +153,7 @@
>          == KMessageBox::Yes ) ) {
>       config->writeEntry( "pass", KMAccount::encryptStr( passwd() ) );
>       mStorePasswdInConfig = true;
>+      config->writeEntry("storepassinconfig", mStorePasswdInConfig);
>     }
>   }
>

Actions: View | Diff

Attachments on bug 132468: 56549