~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/helperfuncs.cpp

450

{

451

if (Config->logpath.empty())

452

{

453

#ifndef DARWIN

454

453

Config->logpath = Config->MyDir + "/ircd.log";

455

#else

456

Config->logpath = "/var/log/ircd.log";

457

#endif

458

454

}

459

455

460

456

Config->log_file = fopen(Config->logpath.c_str(),"a+");

476

472

477

473

void InspIRCd::CheckRoot()

478

474

{

479

#ifndef DARWIN

480

475

if (geteuid() == 0)

481

476

{

482

477

printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");

483

478

this->Log(DEFAULT,"Cant start as root");

484

#else

485

if (geteuid() != 16)

486

{

487

printf("WARNING!!! You are not running inspircd as the ircdaemon user!!! YOU CAN NOT DO THIS!!!\n\n");

488

this->Log(DEFAULT,"Must start as user ircdaemon");

489

#endif

490

479

Exit(EXIT_STATUS_ROOT);

491

480

}

492

481

}

Older »