Update of /cvsroot/mahogany/M/src/util
In directory sc8-pr-cvs1:/tmp/cvs-serv20169/src/util
Modified Files:
upgrade.cpp
Log Message:
hopefully fix for upgarding SSL options (0.64 -> 0.65) bug
Index: upgrade.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/util/upgrade.cpp,v
retrieving revision 1.206
retrieving revision 1.207
diff -b -u -2 -r1.206 -r1.207
--- upgrade.cpp 22 Jul 2003 22:01:42 -0000 1.206
+++ upgrade.cpp 23 Jul 2003 00:59:23 -0000 1.207
@@ -2735,12 +2735,17 @@
// SSLSupport_XXX values
- // we should avoid using READ_CONFIG() because it uses the new default
- // value as fallback and we need the old one
const char *key = GetOptionName(MP_SMTPHOST_USE_SSL);
+ Profile::ReadResult readFrom;
+ bool wasUsingSSL = profile->readEntry(key, false, &readFrom);
+
+ // only replace the value if it is present in this folder as it is
+ // going to be changed in the parent when we visit it anyhow
+ if ( readFrom == Profile::Read_FromHere )
+ {
if ( !profile->writeEntryIfNeeded
(
key,
- profile->readEntry(key, 0)
- ? SSLSupport_SSL : SSLSupport_TLSIfAvailable,
+ wasUsingSSL ? SSLSupport_SSL
+ : SSLSupport_TLSIfAvailable,
GetNumericDefault(MP_SMTPHOST_USE_SSL)
) )
@@ -2748,15 +2753,20 @@
return false;
}
+ }
key = GetOptionName(MP_NNTPHOST_USE_SSL);
+ wasUsingSSL = profile->readEntry(key, false, &readFrom);
+ if ( readFrom == Profile::Read_FromHere )
+ {
if ( !profile->writeEntryIfNeeded
(
key,
- profile->readEntry(key, 0)
- ? SSLSupport_SSL : SSLSupport_TLSIfAvailable,
+ wasUsingSSL ? SSLSupport_SSL
+ : SSLSupport_TLSIfAvailable,
GetNumericDefault(MP_NNTPHOST_USE_SSL)
) )
{
return false;
+ }
}
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
