Commit Graph

4636 Commits

Author SHA1 Message Date
Uli Schlachter 1543635abf integration tests: Improve message when ZNC is missing
Previously, "more or less unrelated" things would fail. After this
change, also a message is printing that gives a hint on what went wrong.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2017-02-28 12:57:13 +01:00
Alexey Sokolov c2c85b2335 Make more modules translateable (#1354) 2017-02-25 12:14:21 +00:00
Alexey Sokolov 80c24b335d Update a comment 2017-02-25 12:13:24 +00:00
Alexey Sokolov ad8d07a87a Improve *autoreply responses to Show and Set commands.
Also make it translatable (#1354)
2017-02-25 11:52:39 +00:00
Alexey Sokolov 6ddede7779 Revert 3382543917 and
00ddcd302f

ListChans for now will behave as before, and ShowChan isn't currently
needed.

See #914
2017-02-24 23:49:18 +00:00
Alexey Sokolov a44aa0c699 Revert tables to how they were in 1.4
See #914
2017-02-24 23:49:18 +00:00
Cizzle fc450cb486 Don't use the same or overlapping NickPrefix as StatusPrefix in the crypt module
Don't use a key which is a valid nickname, now changed to "@nick-prefix@" instead.
If you had loaded the crypt module before, the old settings will be converted.

Also check if the nick-prefix and status-prefix aren't the same or overlapping, "*" or "." are then used depending on either value. If they would be the same, you would be messaging a module instead of a user.
And if they'd overlap, depending on the nick, you could be messaging a module as well.
2017-02-22 15:25:08 +00:00
Alexey Sokolov 96dcde4329 Merge branch 'master' of github.com:znc/znc 2017-02-19 10:34:55 +00:00
Alexey Sokolov 455b5f8076 Merge branch '1.6.x' 2017-02-19 10:33:01 +00:00
Alexey Sokolov 0679957340 Fix regression of 1.6.4 which caused crash in modperl/modpython.
See #1283
2017-02-19 10:30:44 +00:00
Christophe Beauval 02db444941 Add /install_manifest.txt and /install_manifest_*.txt to .gitignore. 2017-02-14 22:58:27 +00:00
Jos Ahrens 14e68299fe cli: help: sort arguments alphabetically (#1367)
Changes the output of `znc --help` to order the arguments
in alphabetical order.
2017-01-21 15:36:12 +00:00
Jos Ahrens 9635658258 [sasl] Do not try to convert entire "verbose" command to bool. (#1365)
Fixes #1291 for the stable branch.

Ref. https://github.com/znc/znc/commit/9864b2716a0274e046867aba83962b979d078bdd
for the original fix by psychon with dgw, this is merely a non-cherry-pick backport
as I realized too late it was already fixed elsewhere in the same manner.
2017-01-21 15:32:38 +00:00
Jos Ahrens a7be8fcd9c autoconf/makefile: alphabetically sort the modules we compile (#1368)
This alphabetically sorts the modules/ we compile so
that it's easier to see where we're currently at.
Has no effect with `make -j2`

Fixes #1358
2017-01-21 15:30:09 +00:00
Alexey Sokolov ec52dccace Merge branch 'master' of github.com:znc/znc 2017-01-15 23:07:25 +00:00
Alexey Sokolov c7c878adc8 Fix build on macOS Sierra (10.12)
Rename OS X to macOS
Add Sierra to Travis
2017-01-15 23:04:55 +00:00
Alexey Sokolov 55adbc896e Travis: the last job should wait for the rest, not the first one
Mitigate timeouts
2017-01-15 23:04:42 +00:00
Jos Ahrens 188b091514 SASL: More informative help command for Set.
With #1338, the parameter username was made optional, but the help
was not changed to reflect this.

ref. https://github.com/znc/znc/pull/1338#issuecomment-270563035
2017-01-12 22:12:01 +00:00
Alexey Sokolov 4416ef9731 Add a TODO
[skip ci]
2017-01-12 00:08:48 +00:00
Alexey Sokolov 1bb0199ec4 Fix missing renames in #1191 2017-01-08 10:06:21 +00:00
Alexey Sokolov ded8a00358 Fix detection of _FILE_OFFSET_BITS in CMake
The test wrongly succeeded in C instead of correctly failing in C++
That caused off_t to be different types in core and in modpython on
32-bit systems, and modpython couldn't load with undefined symbol.
2017-01-08 03:09:36 +00:00
Alexey Sokolov e7b9ab2746 Make cyrusauth translateable (#1354) 2016-12-27 09:20:20 +00:00
Alexey Sokolov b4b085dc2d Partially fix type of function pointer.
Found using UBSan.
Full fix would require adding visibility attribute to CUser,
CIRCNetwork, CModule, CModuleEntry, CModInfo *and* make sure these
attributes are visible to enough code.
The second statement is more difficult to fulfill, because forward
declaration of CUser is not enough, because the attribute is on class
definition. So Modules.h would need to include many other includes.

Probably it should be changed at some point.

See http://stackoverflow.com/questions/27976687/clangs-ubsan-function-pointer-is-this-illegal
2016-12-26 20:09:13 +00:00
Jos Ahrens 1b5bd128cc stickychan: Timer down to 60 seconds from 180. 2016-12-26 20:08:52 +00:00
Jos Ahrens e80582326a stickychan: stop checking so often, increase delay to once every 3 minutes 2016-12-26 20:08:52 +00:00
Alexey Sokolov 2fcde9f2e1 Fix a couple of issues pointed out by https://scan.coverity.com/ 2016-12-26 17:22:09 +00:00
Alexey Sokolov b666931883 Add an option to change ping timeout time.
Fix #979
2016-12-26 15:49:26 +00:00
Alexey Sokolov d9c1da8a68 Make it possible to translate arguments in help text of module commands
Ref #1354
2016-12-25 21:11:02 +00:00
Alexey Sokolov b5fde609c4 Make adminlog and alias translatable, rerun 'make translate'
Ref #1354
2016-12-25 21:02:42 +00:00
Alexey Sokolov a1e1591ba5 Add another layer of indirection for translation
To make supporting old modules easier

Ref #1354
2016-12-25 20:31:17 +00:00
Alexey Sokolov ef6fb13ed2 Fix some modpython/modperl dependencies in cmake 2016-12-25 15:49:01 +00:00
Alexey Sokolov c803a85e13 Rename new On...Message modules callbacks to be more consistent.
OnPrivMessage -> OnPrivTextMessage
OnChanMessage -> OnChanTextMessage

Fix #1191
2016-12-25 15:48:29 +00:00
Alexey Sokolov 30cd0584a1 Fix build on FreeBSD for the latest CIDR commits 2016-12-25 13:53:17 +00:00
Alexey Sokolov b445ad30e3 Modernize CIDR code. 2016-12-25 13:52:54 +00:00
Alexey Sokolov 6fbab7b44c Add CIDR support to TrustedProxy setting
Fix #1219
2016-12-25 13:00:02 +00:00
Alexey Sokolov bd1a71cb29 Add Ru translation for existing strings in core.
It's not very big so far.

See #1354
2016-12-24 18:53:25 +00:00
Alexey Sokolov 13049e5fc3 Refactor the way how modules are loaded.
Make version checks more strict.

This finishes attempt to preserve ABI between patch versions. That
didn't work well, and the people who could make it work, left the
project already.

Close #1255
Close #1274
Close #172
2016-12-22 20:49:01 +00:00
Alexey Sokolov 6125b5d1b8 Fix a warning in samplewebapi 2016-12-22 20:48:21 +00:00
Alexey Sokolov 106a36c22b Rerun SWIG in CMake build when headers change. 2016-12-21 08:59:10 +00:00
Alexey Sokolov 0a36695add Revert openssl workaround of 1.6 branch from 1.7 branch 2016-12-10 21:18:47 +00:00
Alexey Sokolov 9c16640340 Merge branch '1.6.x' 2016-12-10 21:18:10 +00:00
Alexey Sokolov 3d386aff19 Return version number to 1.6.x 2016-12-10 21:07:02 +00:00
Alexey Sokolov ed71ad1e2b Increase the version number to 1.6.4 znc-1.6.4 2016-12-10 20:51:18 +00:00
Alexey Sokolov 3bd46744cc 1.6.4-rc3 znc-1.6.4-rc3 2016-12-03 19:23:00 +00:00
Alexey Sokolov 1a89740335 Stop-gap for OpenSSL 1.1 in 1.6 branch.
This is properly fixed already in 1.7 branch.
2016-12-03 19:08:56 +00:00
Alexey Sokolov 6cde8b3950 Fix #1347 for 1.7 branch.
Commit 51fb6f09f4b8065b82f9a0ab1d1702ad8998f389 in 1.6.x branch has more
details.
2016-12-01 23:34:55 +00:00
Alexey Sokolov 63a2fbc634 Don't reset module's attributes to NULL during CALLMOD.
It conflicted with nested calls to a module. Such calls usually don't
happen, but could be triggered using alias module.

In this case m_pClient became NULL while executing the alias, and the
rest of that alias caused segfault.

Fix #1347
2016-12-01 23:31:56 +00:00
Alexey Sokolov 0aa3f7e362 route_replies: fix module to check if we are not connected to a network.
Cherry-pick of 34db7be4ae
znc-1.6.4-rc2
2016-11-22 23:53:39 +00:00
Alexey Sokolov d596226ddc ZNC 1.6.4-rc1 znc-1.6.4-rc1 2016-11-20 23:51:03 +00:00
Alexey Sokolov 2e6c8d90e7 Link pyeval to its wiki page 2016-11-20 23:43:53 +00:00