adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-06 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert r2159

Browse Source 
Turns out that OpenBSD does define IPV6_V6ONLY, but setting that option fails.
So this commit was no good after all. :(


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2161 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-10-21 16:12:03 +00:00
parent 5df13a3eda
commit c9278e8f72
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
znc.cpp
-17
View File
@@ -673,14 +673,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
CString s6 = "4";
#ifdef HAVE_IPV6
if (CUtils::GetBoolInput("Would you like ZNC to listen using ipv6?", false)) {
#ifdef IPV6_V6ONLY
s6 = " ";
#else
// When we have IPV6_V6ONLY, "Listener" will listen on both v4 and v6.
// If we don't have it, "Listener" and "Listener6" are equivalent. Let's
// use "Listener6" in this case since that describes the result better.
s6 = "6";
#endif
}
#endif
@@ -1471,16 +1464,6 @@ bool CZNC::DoRehash(CString& sError)
if (sName.Equals("Listener6")) {
eAddr = ADDR_IPV6ONLY;
}
#if defined(HAVE_IPV6) && !defined(IPV6_V6ONLY)
if (sName.Equals("Listener")) {
CUtils::PrintMessage("Your system doesn't support IPV6_V6ONLY.", true);
CUtils::PrintMessage("Please use \"Listener4\" and \"Listener6\""
" to explicitly select between IPV4 and IPV6");
// Let's hope that this causes
// the least surprise.
eAddr = ADDR_IPV4ONLY;
}
#endif
CListener::EAcceptType eAccept = CListener::ACCEPT_ALL;
if (sValue.TrimPrefix("irc_only "))