Skip to content


Subversion checkout URL

You can clone with
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: znc/znc
base: 8deb28392449^
head fork: znc/znc
compare: 6953efb38171
Commits on Apr 14, 2014
@KindOne- KindOne- Correct double output in controlpanel.
(cherry picked from commit e73f056)
@DarthGandalf DarthGandalf Fix new OnAdd/DeleteNetwork hooks for perl/python
(cherry picked from commit 2a7bc29)
@DarthGandalf DarthGandalf Don't generate .pyc files ourself
It's good for cross-compilation, because in that case binaries produced
by CXX are not runnable.

(cherry picked from commit bfd1edc)
@vincentbernat vincentbernat awaystore: ping when requesting to come back
When using the `back` command, also call `Ping()`. Otherwise, we will
be marked away in less than a minute.

(cherry picked from commit 459afe1)
Andrew Northall Add the ability to set and retrieve MaxNetworks
(cherry picked from commit 5f660f3)
@Dessimat0r Dessimat0r Added SSL (+) and port in networks list for connected servers.
(cherry picked from commit 054e873)
@dgw dgw tweak wording of "out of networks" errors
(cherry picked from commit 2b3d40a)
@Un1matr1x Un1matr1x Welcome to 2014 - year 10 with ZNC
(cherry picked from commit f19b4ca)
@jamesoff jamesoff Trim servername in jump command
Fixes e.g. tab-completing servername in irssi

(cherry picked from commit 07c1628)
@ConorOG ConorOG fix #235, erroric console output, status message overwrite
using alternative message style
otherwise ncurses/terminal codes for cursor position would seem necessary

(cherry picked from commit 2d1a632)
@ConorOG ConorOG define terminal control codes for messages, tidy, tweak ok message
(cherry picked from commit dd0ba1d)
@dgw dgw Add identify prompt for
Apparently uses a very old (?) or obscure NickServ
service that doesn't send any of the more common prompts for ID.
(It also doesn't support nick grouping, more's the pity.)
(cherry picked from commit e379a7a)
@DarthGandalf DarthGandalf Fix ./configure not to fail on non-bash
Thanks to jayne for patch

(cherry picked from commit a727ca6)
@DarthGandalf DarthGandalf Fix modperl build on MacOS X
.so is not the right extension for shared objects there

(cherry picked from commit d05e069)
@dgw dgw nickserv message support
Makes sure ZNC understands when NickServ at (N) asks
the user to identify. Addresses #364

(cherry picked from commit 4747c07)
@DarthGandalf DarthGandalf Warn users about port 6667 in --makeconf
This should decrease chance of web browsers failing to connect to ZNC

(cherry picked from commit f456b27)
@psychon psychon Check for pkg-config before calling automake
Signed-off-by: Uli Schlachter <>
(cherry picked from commit c5f31f0)
@marsjaninzmarsa marsjaninzmarsa Disable autocomplete password on add_edit_user.tpml
Autocomplete should be desabled because in default web browsers fill this resoulting "Invalid user settings" message when for example user changes skin.
(cherry picked from commit 1587103)
@galdor galdor Include the command name in ERR_INVALIDCAPCMD messages
As described in the IRCv3 Client Capability Negotiation document

(cherry picked from commit f215ec6)
@DarthGandalf DarthGandalf Don't ask if user wants to create znc.pem or not
Sure they want!

(cherry picked from commit 05ca849)
@DarthGandalf DarthGandalf Don't reread list of TZs every time
(cherry picked from commit 225b494)
@dgw dgw Remove accidental timeout in shell module
(cherry picked from commit 38fc398)
@DarthGandalf DarthGandalf Don't create ~/.znc/modules/
It confuses people too much

(cherry picked from commit 2858da4)
@DarthGandalf DarthGandalf Fix build of modperl under MacOS X, again
(cherry picked from commit 4e5a45f)
@KiNgMaR KiNgMaR certauth: case insensitive hex key comparison
As noted in issue 464, comparing the hex representation of the public
key fingerprint should be case insensitive.

(cherry picked from commit f4a7386)
@KiNgMaR KiNgMaR certauth: improve const correctness
(cherry picked from commit 39468f6)
@KiNgMaR KiNgMaR squash some compiler warnings
(cherry picked from commit b3021f9)
@KiNgMaR KiNgMaR Fix AddServerThrottle.
(cherry picked from commit 13040d9)
@KiNgMaR KiNgMaR work around Win32 rename() issue using native API
(cherry picked from commit d80e989)
@DarthGandalf DarthGandalf MacOS X: require SWIG 2.0.12
To fix build of modpython

(cherry picked from commit 591b95e)
@dgw dgw add src/version.cpp to gitignore
(cherry picked from commit 36202ca)
@DarthGandalf DarthGandalf Fix znc-buildmod
It failed to build some modules...

Thanks to kay45 for reporting this

(cherry picked from commit a83c823)
@DarthGandalf DarthGandalf Don't ask for listen host in --makeconf
It confuses people too much.
Who wants ZNC to listen on localhost, may change settings immediately
after, via webadmin or /msg *status

(cherry picked from commit 6295cea)
@psychon psychon webadmin/add channel: Correctly handle channel names
The CChan constructor makes sure that the channel name begins with a valid
channel prefix. Thus, this could change the name of the resulting channel.

When you edited an irc network which already had a channel "#foo", were
connected to IRC (so ZNC knows which prefixes are valid) and added a channel
"foo", this would lead to a problem:

Webadmin checks and sees that there is no channel "foo" yet. Webadmin creates a
new CChan instance for "foo". The CChan constructor notices that "f" is not a
valid channel prefix and instead calls itself "#foo". Then,
CIRCNetwork::AddChan() would see that this channel already exists, delete the
given channel and return false.

However, webadmin didn't check this result and would continue changing settings
on an already destroyed CChan instance.

Fix this by checking if the channel exists after CChan had its chance to mess
with the channel name. Also handle failures from CIRCNetwork::AddChan().

Fixes #528.

Signed-off-by: Uli Schlachter <>
(cherry picked from commit 5e6e3be)
@Nothing4You Nothing4You Add BindHost to Get/SetNetwork in *controlpanel
(cherry picked from commit cdd16f3)
@Nothing4You Nothing4You Fix BindHost in SetNetwork in *controlpanel to check permissions
(cherry picked from commit 530bbb5)
@Nothing4You Nothing4You Fix *controlpanel not checking whether the bindhost is in the whitelist
(cherry picked from commit e77edb4)
@teward teward Reword ClearBindHost/ClearUserBindHost success msg
The ClearBindHost and ClearUserBindHost success messages do not make a distinction on whether it's a network bind host that's being cleared or whether it's a user bind host that's being cleared.  I think that this should be reworded to make the distinction.
(cherry picked from commit 12d81e1)
@DarthGandalf DarthGandalf Increase the version number to 1.3
(cherry picked from commit e8e95d7)
Commits on Apr 19, 2014
@DarthGandalf DarthGandalf Don't redefine _FORTIFY_SOURCE if compiler already defines it
(cherry picked from commit 72f171d)
@DarthGandalf DarthGandalf Travis: Change efnet server on this branch too 6953efb