mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conditionally compile the SASL code only with botan and database

Browse Source
This commit is contained in:
louiz’
2020-07-29 00:37:24 +02:00
parent e4550d324f
commit 189015afb4
6 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xmpp/biboumi_adhoc_commands.cpp
+19 -19
View File
@@ -310,6 +310,20 @@ void ConfigureIrcServerStep1(XmppComponent&, AdhocSession& session, XmlNode& com
fingerprint_value.set_inner(options.col<Database::TrustedFingerprint>());
}
}
{
XmlSubNode field(x, "field");
field["var"] = "sasl_password";
field["type"] = "text-private";
field["label"] = "SASL Password";
set_desc(field, "Use it to authenticate with your nick.");
if (!options.col<Database::SaslPassword>().empty())
{
XmlSubNode value(field, "value");
value.set_inner(options.col<Database::SaslPassword>());
}
}
#endif
{
@@ -325,19 +339,6 @@ void ConfigureIrcServerStep1(XmppComponent&, AdhocSession& session, XmlNode& com
}
}
{
XmlSubNode field(x, "field");
field["var"] = "sasl_password";
field["type"] = "text-private";
field["label"] = "SASL Password";
set_desc(field, "Use it to authenticate with your nick.");
if (!options.col<Database::SaslPassword>().empty())
{
XmlSubNode value(field, "value");
value.set_inner(options.col<Database::SaslPassword>());
}
}
{
XmlSubNode pass(x, "field");
pass["var"] = "pass";
@@ -486,18 +487,17 @@ void ConfigureIrcServerStep2(XmppComponent& xmpp_component, AdhocSession& sessio
}
else if (field->get_tag("var") == "fingerprint" && value)
{
options.col<Database::TrustedFingerprint>() = value->get_inner();
}
options.col<Database::TrustedFingerprint>() = value->get_inner();
else if (field->get_tag("var") == "sasl_password" && value)
options.col<Database::SaslPassword>() = value->get_inner();
#endif // BOTAN_FOUND
else if (field->get_tag("var") == "nick" && value)
options.col<Database::Nick>() = value->get_inner();
else if (field->get_tag("var") == "sasl_password" && value)
options.col<Database::SaslPassword>() = value->get_inner();
else if (field->get_tag("var") == "pass" && value)
options.col<Database::Pass>() = value->get_inner();