summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2013-08-19 18:20:39 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2013-08-19 18:20:39 +0000
commit857add6ec30c59d98482c21c60e13f8c3adb89e9 (patch)
treeb2fefa78934636bce45e898b77b08d0ba746180f
parent7056d9f7bf15b9e9d8e21bb8f38688733a73920d (diff)
- mirandaboot.ini and some miranda defaults are changed
git-svn-id: http://svn.miranda-ng.org/main/trunk@5749 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--docs/mirandaboot.ini4
-rw-r--r--src/modules/database/dbini.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/mirandaboot.ini b/docs/mirandaboot.ini
index fb08f3c0a8..5e6b7150fb 100644
--- a/docs/mirandaboot.ini
+++ b/docs/mirandaboot.ini
@@ -49,7 +49,7 @@ AutoCreate=no
;"no": Disable the autoexec system entirely
;"prompt": (default) Prompt the user before each installation
;This setting doesn't affect the decision of whether to display further prompts
-Use=prompt
+Use=yes
;Glob
;A global expression containing the files to watch for database settings
@@ -68,7 +68,7 @@ Safe=CLC Icons CLUI CList SkinSounds PluginUpdater
;Unsafe
;A space-separated list of database module names that could be alter to
;malicious purposes (eg by faking a login server to steal passwords)
-;Default: ICQ MSN
+;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER XFire
Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER XFire
;OverrideSecurityFilename
diff --git a/src/modules/database/dbini.cpp b/src/modules/database/dbini.cpp
index 8c5aa31fce..8105a58e4d 100644
--- a/src/modules/database/dbini.cpp
+++ b/src/modules/database/dbini.cpp
@@ -395,9 +395,9 @@ static void DoAutoExec(void)
GetPrivateProfileString(_T("AutoExec"), _T("Use"), _T("prompt"), szUse, SIZEOF(szUse), mirandabootini);
if ( !lstrcmpi(szUse, _T("no"))) return;
- GetPrivateProfileString(_T("AutoExec"), _T("Safe"), _T("CLC Icons CLUI CList SkinSounds"), buf, SIZEOF(buf), mirandabootini);
+ GetPrivateProfileString(_T("AutoExec"), _T("Safe"), _T("CLC Icons CLUI CList SkinSounds PluginUpdater"), buf, SIZEOF(buf), mirandabootini);
szSafeSections = mir_t2a(buf);
- GetPrivateProfileString(_T("AutoExec"), _T("Unsafe"), _T("ICQ MSN"), buf, SIZEOF(buf), mirandabootini);
+ GetPrivateProfileString(_T("AutoExec"), _T("Unsafe"), _T("AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER XFire"), buf, SIZEOF(buf), mirandabootini);
szUnsafeSections = mir_t2a(buf);
GetPrivateProfileString(_T("AutoExec"), _T("Warn"), _T("notsafe"), szSecurity, SIZEOF(szSecurity), mirandabootini);
if ( !lstrcmpi(szSecurity, _T("none"))) secur = 0;