diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-18 22:36:39 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-18 22:36:39 +0200 |
| commit | 1a41909ef98ea328366ae7f62a61fd417b5378bc (patch) | |
| tree | 9b48fab3481d1c16c19beecec41ac04a596d5b10 | |
| parent | 9789f6f29bdf89722ae122e396ac78c6403d58b9 (diff) | |
| download | tdelibs-1a41909ef98ea328366ae7f62a61fd417b5378bc.tar.gz tdelibs-1a41909ef98ea328366ae7f62a61fd417b5378bc.zip | |
Fix unintended renaming of magic string for TDEWallet files
This resolves Bug 1658
TDEWallet remains compatible with KWallet, and therefore
it is not practical to change the magic string. If in the
future will not be possible to maintain compatibility,
magic string will be changed afterwards.
| -rw-r--r-- | tdeio/magic | 2 | ||||
| -rw-r--r-- | tdewallet/backend/tdewalletbackend.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tdeio/magic b/tdeio/magic index 01b05bd6d..dbee7abba 100644 --- a/tdeio/magic +++ b/tdeio/magic @@ -1036,7 +1036,7 @@ #------------------------------------------------------------------------------ # TDEWallet file -0 string TDEWALLET\012\015\000\015\012 application/x-tde-wallet +0 string KWALLET\012\015\000\015\012 application/x-tde-wallet #------------------------------------------------------------------------------ # ICA Client configuration files diff --git a/tdewallet/backend/tdewalletbackend.cc b/tdewallet/backend/tdewalletbackend.cc index 84160ba03..5fe313ed9 100644 --- a/tdewallet/backend/tdewalletbackend.cc +++ b/tdewallet/backend/tdewalletbackend.cc @@ -51,7 +51,7 @@ using namespace TDEWallet; -#define KWMAGIC "TDEWALLET\n\r\0\r\n" +#define KWMAGIC "KWALLET\n\r\0\r\n" #define KWMAGIC_LEN 12 static void initTDEWalletDir() |