Commit Graph

4617 Commits

Author SHA1 Message Date
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
Alexey Sokolov 5c524df298 Merge branch '1.6.x' 2016-11-20 18:09:55 +00:00
Alexey Sokolov 6366430870 Fix deletion of users which are connecting.
Close #1342
2016-11-20 17:56:26 +00:00
Alexey Sokolov a76a9db369 Merge branch '1.6.x' of github.com:znc/znc into 1.6.x 2016-11-19 23:41:15 +00:00
Alexey Sokolov 2feced63e1 Merge branch '1.6.x' 2016-11-19 23:39:32 +00:00
Alexey Sokolov 0ac3cfc8d5 Fix regression of 1.6.0
Cloning a user caused a non-immediate segfault.
This was fixed already in 1.7 branch (by refactoring).
Fix #1340
2016-11-19 23:35:12 +00:00
Alexey Sokolov 676d105347 Workaround gitter for 1.6
It's fixed properly for 1.7 already.
Fix #1321
2016-11-17 23:45:25 +00:00
Will Elwood 4c7fa1aabf Fix version.sh for ancient git
I'm not sure when the `format` argument was added to `git log`, but it seems to be an alias for `pretty` (ie both exist in current versions of git). I noticed this was failing on my ancient system that's stuck with git 1.5, this makes it work.

Also, `ignore-submodules` is not understood by ancient `git status` - I believe the expected output would be achieved by simply removing this argument, but it's not important since it fails gracefully enough and fixing it so newer git doesn't fail seems more complicated.
2016-11-16 15:49:47 +00:00
Alexey Sokolov 19c44bc8c5 Merge branch '1.6.x'
Fix #1310
2016-11-16 14:59:15 +00:00
Alexey Sokolov c0c1fb14f4 Update Csocket submodule: fix openssl 1.1 2016-11-16 14:50:00 +00:00
Alexey Sokolov 0aaabe8c9f Update Csocket submodule: fix build with openssl 1.1 2016-11-16 14:42:34 +00:00
Alexey Sokolov 806edd048a AppVeyor: cygwin's python3 package was split to -devel. Install it. 2016-11-12 14:51:38 +00:00
Jos Ahrens 881fa94add sasl: Make the first requirement for SET actually mandatory, return information about settings if no input for SET 2016-11-12 14:38:35 +00:00
John Reese c55caba68b Fix spelling in documentation 2016-11-07 20:53:31 +00:00
Alexey Sokolov 39646b620d Merge pull request #1327 from lol768/module_csrf_override
Module CSRF override support (mark II)

Close #1180
Close #1296
2016-10-08 23:31:06 +01:00
lol768 d40d87e268 Fix race condition by using ReadUntil per review 2016-10-05 09:32:02 +01:00
lol768 9cc59b2b78 Address review comment, module is already global
https://github.com/lol768/znc/commit/b94c639e6a1755c33cc315aad247bbc50a83209e#commitcomment-19252797
2016-10-05 09:32:02 +01:00
lol768 e066f896ef Add integration test for module CSRF overrides 2016-10-05 09:32:02 +01:00
lol768 3930c5b34e Sample web API doesn't make sense as a user module 2016-10-05 09:29:40 +01:00
lol768 0393153a62 Allow anonymous access for sample mod
This makes testing simpler.
2016-10-05 09:29:40 +01:00