From 45183612c845e36f8124529f52675655c27f550b Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 11 Aug 2015 13:58:19 +0200 Subject: [PATCH 1/2] Fix CClient::GetNickMask() A regression introduced by cebc093. A potentially empty network specific bind _host_ should not be used as nick mask _ident_. --- src/Client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Client.cpp b/src/Client.cpp index 19c99557..e6e741f5 100644 --- a/src/Client.cpp +++ b/src/Client.cpp @@ -853,7 +853,7 @@ CString CClient::GetNickMask() const { sHost = "irc.znc.in"; } - return GetNick() + "!" + (m_pNetwork ? m_pNetwork->GetBindHost() : m_pUser->GetIdent()) + "@" + sHost; + return GetNick() + "!" + (m_pNetwork ? m_pNetwork->GetIdent() : m_pUser->GetIdent()) + "@" + sHost; } bool CClient::IsValidIdentifier(const CString& sIdentifier) { From 4c70b6405fcf7b896dd1e599bc8887a949b2369a Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Tue, 11 Aug 2015 20:57:09 +0100 Subject: [PATCH 2/2] Make error message from ./bootstrap.sh less confusing. --- autogen.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/autogen.sh b/autogen.sh index e506185f..85e17395 100755 --- a/autogen.sh +++ b/autogen.sh @@ -23,6 +23,7 @@ do_cmd() { } test -f configure.ac || die "No configure.ac found." +which pkg-config > /dev/null || die "ERROR: pkg-config not found. Install pkg-config and run $0 again" # Generate aclocal.m4 for use by autoconf do_cmd $ACLOCAL $ACLOCAL_FLAGS @@ -31,12 +32,6 @@ do_cmd $AUTOHEADER $AUTOHEADER_FLAGS # Generate configure do_cmd $AUTOCONF $AUTOCONF_FLAGS -if grep PKG_CHECK_MODULES configure > /dev/null -then - rm configure - die "ERROR: pkg-config not found. Install pkg-config and run $0 again" -fi - # Copy config.sub, config.guess, install.sh, ... # This will complain that we don't use automake, let's just ignore that do_cmd $AUTOMAKE $AUTOMAKE_FLAGS || true