~ubuntu-branches/ubuntu/oneiric/inspircd/oneiric-security

Committer: Bazaar Package Importer
Author(s): Bhavani Shankar
Date: 2008-11-15 20:39:50 UTC
mfrom: (1.1.4 upstream) (3.1.2 sid)
Revision ID: james.westby@ubuntu.com-20081115203950-uv1pf98x2vkon7se

Tags: 1.1.21+dfsg-1ubuntu1

* Merge from debian unstable, remaining changes: (LP: #298418)
- debian/patches/04_include-limits-h.dpatch:
+ Explicitly include limits.h for gcc 4.3.

files added:
include/socketengine_poll.h

src/socketengine_poll.cpp

files modified:
conf/inspircd.quotes.example

configure

debian/changelog

debian/control

docs/inspircd.conf.example

include/inspircd.h

src/cmd_info.cpp

src/cmd_rehash.cpp

src/cmd_topic.cpp

src/cmd_userhost.cpp

src/configreader.cpp

src/helperfuncs.cpp

src/inspircd.cpp

src/inspsocket.cpp

src/modes/umode_o.cpp

src/modules/extra/m_ldapauth.cpp

src/modules/extra/m_mysql.cpp

src/modules/extra/m_sqlv2.h

src/modules/extra/m_ssl_gnutls.cpp

src/modules/extra/m_ssl_openssl.cpp

src/modules/extra/m_ziplink.cpp

src/modules/m_chanprotect.cpp

src/modules/m_customtitle.cpp

src/modules/m_ident.cpp

src/modules/m_jumpserver.cpp

src/modules/m_override.cpp

src/modules/m_restrictchans.cpp

src/modules/m_services.cpp

src/modules/m_spanningtree/main.cpp

src/modules/m_spanningtree/main.h

src/modules/m_spanningtree/treesocket1.cpp

src/modules/m_spanningtree/treesocket2.cpp

src/modules/m_sslmodes.cpp

src/modules/m_svshold.cpp

src/modules/m_swhois.cpp

src/modules/m_taxonomy.cpp

src/modules/m_userip.cpp

src/socket.cpp

src/socketengine_epoll.cpp

src/socketengine_select.cpp

src/users.cpp

src/version.sh

win/inspircdVC80.vcproj

Show diffs side-by-side

added added

removed removed

src/inspircd.cpp

639

this->BuildISupport();

640

InitializeDisabledCommands(Config->DisabledCommands, this);

641

642

if ((Config->ports.size() == 0) && (found_ports > 0))

643

{

644

printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");

645

Log(DEFAULT,"ERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?");

646

Exit(EXIT_STATUS_BIND);

647

}

648

649

642

if (Config->ports.size() != (unsigned int)found_ports)

650

643

{

651

644

printf("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %d of %d client ports bound.\n\n", bounditems, found_ports);

653

646

int j = 1;

654

647

for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)

655

648

{

656

printf("%d.\tIP: %s\tPort: %lu\n", j, i->first.empty() ? "<all>" : i->first.c_str(), (unsigned long)i->second);

649

printf("%d.\tAddress: %s\tReason: %s\n", j, i->first.empty() ? "<all>" : i->first.c_str(), i->second.c_str());

657

650

}

658

651

}

652

653

if ((Config->ports.size() == 0) && (found_ports > 0))

654

{

655

printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");

656

Log(DEFAULT,"ERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?");

657

Exit(EXIT_STATUS_BIND);

658

}

659

660

#ifndef WINDOWS

660

661

if (!Config->nofork)

661

662

{

Older »