adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-05 17:31:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.6'

Browse Source
This commit is contained in:
J-P Nurmi
2015-02-19 09:37:47 +01:00
parent 4d44bfe10f d7598a76dc
commit c0abef2c00
7 changed files with 109 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/sasl.cpp
+2 -2
View File
@@ -70,11 +70,11 @@ public:
AddCommand("Help", static_cast<CModCommand::ModCmdFunc>(&CSASLMod::PrintHelp),
"search", "Generate this output");
AddCommand("Set", static_cast<CModCommand::ModCmdFunc>(&CSASLMod::Set),
"username password", "Set username and password for the PLAIN mechanism");
"<username> [<password>]", "Set username and password for the mechanisms that need them. Password is optional");
AddCommand("Mechanism", static_cast<CModCommand::ModCmdFunc>(&CSASLMod::SetMechanismCommand),
"[mechanism[ ...]]", "Set the mechanisms to be attempted (in order)");
AddCommand("RequireAuth", static_cast<CModCommand::ModCmdFunc>(&CSASLMod::RequireAuthCommand),
"[yes|no]", "Don't connect if SASL cannot be authenticated");
"[yes|no]", "Don't connect unless SASL authentication succeeds");
m_bAuthenticated = false;
}
modules/savebuff.cpp
+2 -2
View File
@@ -93,13 +93,13 @@ public:
else
m_sPassword = CBlowfish::MD5(sArgs);
AddTimer(new CSaveBuffJob(this, 60, 0, "SaveBuff", "Saves the current buffer to disk every 1 minute"));
return( !m_bBootError );
}
virtual bool OnBoot() override
{
AddTimer(new CSaveBuffJob(this, 60, 0, "SaveBuff", "Saves the current buffer to disk every 1 minute"));
CDir saveDir(GetSavePath());
for (CFile* pFile : saveDir) {
CString sName;