/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 Alexander Barton (alex@barton.de).
+ * Copyright (c)2001-2010 Alexander Barton (alex@barton.de).
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#endif
#include "defines.h"
-#include "resolve.h"
#include "conn.h"
#include "conf-ssl.h"
-#include "client.h"
#include "channel.h"
#include "conf.h"
#include "lists.h"
static void Fill_Version PARAMS(( void ));
-static void Setup_FDStreams PARAMS(( void ));
+static void Setup_FDStreams PARAMS(( int fd ));
static bool NGIRCd_Init PARAMS(( bool ));
Fill_Version( );
- /* Kommandozeile parsen */
+ /* parse conmmand line */
for( i = 1; i < argc; i++ )
{
ok = false;
if(( argv[i][0] == '-' ) && ( argv[i][1] == '-' ))
{
- /* Lange Option */
-
+ /* long option */
if( strcmp( argv[i], "--config" ) == 0 )
{
if( i + 1 < argc )
}
else if(( argv[i][0] == '-' ) && ( argv[i][1] != '-' ))
{
- /* Kurze Option */
+ /* short option */
for( n = 1; n < strlen( argv[i] ); n++ )
{
ok = false;
}
}
- /* Debug-Level (fuer IRC-Befehl "VERSION") ermitteln */
+ /* Debug-Level (for IRCs "VERSION" command) */
NGIRCd_DebugLevel[0] = '\0';
#ifdef DEBUG
if( NGIRCd_Debug ) strcpy( NGIRCd_DebugLevel, "1" );
}
#endif
- /* Soll nur die Konfigurations ueberprueft und ausgegeben werden? */
if( configtest )
{
Show_Version( ); puts( "" );
if( ! NGIRCd_NoDaemon ) Log_InitErrorfile( );
#endif
- /* Signal-Handler initialisieren */
Initialize_Signal_Handler( );
- /* Protokoll- und Server-Identifikation erzeugen. Die vom ngIRCd
- * beim PASS-Befehl verwendete Syntax sowie die erweiterten Flags
- * sind in doc/Protocol.txt beschrieben. */
+ /*
+ * create protocol and server identification.
+ * The syntax used by ngIRCd in PASS commands and the extended flags
+ * are described in doc/Protocol.txt
+ */
#ifdef IRCPLUS
snprintf( NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, IRCPLUSFLAGS );
#ifdef ZLIB
#ifdef ZLIB
strlcat( NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID );
#endif
- Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID );
+ LogDebug("Protocol and server ID is \"%s\".", NGIRCd_ProtoID);
- /* Vordefinierte Channels anlegen */
Channel_InitPredefined( );
- /* Listen-Ports initialisieren */
if( Conn_InitListeners( ) < 1 )
{
Log( LOG_ALERT, "Server isn't listening on a single port!" );
#ifdef ZLIB
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
strlcat( NGIRCd_VersionAddition, "ZLIB", sizeof NGIRCd_VersionAddition );
#endif
#ifdef SSL_SUPPORT
#ifdef TCPWRAP
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
strlcat( NGIRCd_VersionAddition, "TCPWRAP", sizeof NGIRCd_VersionAddition );
#endif
#ifdef ZEROCONF
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
strlcat( NGIRCd_VersionAddition, "ZEROCONF", sizeof NGIRCd_VersionAddition );
#endif
#ifdef IDENTAUTH
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
strlcat( NGIRCd_VersionAddition, "IDENT", sizeof NGIRCd_VersionAddition );
#endif
+#ifdef PAM
+ if (NGIRCd_VersionAddition[0])
+ strlcat(NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition);
+ strlcat(NGIRCd_VersionAddition, "PAM", sizeof NGIRCd_VersionAddition);
+#endif
#ifdef DEBUG
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
strlcat( NGIRCd_VersionAddition, "DEBUG", sizeof NGIRCd_VersionAddition );
#endif
#ifdef SNIFFER
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
strlcat( NGIRCd_VersionAddition, "SNIFFER", sizeof NGIRCd_VersionAddition );
#endif
#ifdef STRICT_RFC
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
strlcat( NGIRCd_VersionAddition, "RFC", sizeof NGIRCd_VersionAddition );
#endif
#ifdef IRCPLUS
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
strlcat( NGIRCd_VersionAddition, "IRCPLUS", sizeof NGIRCd_VersionAddition );
#endif
#ifdef WANT_IPV6
if (NGIRCd_VersionAddition[0])
strlcat(NGIRCd_VersionAddition, "+", sizeof(NGIRCd_VersionAddition));
-
strlcat(NGIRCd_VersionAddition, "IPv6", sizeof(NGIRCd_VersionAddition));
#endif
if( NGIRCd_VersionAddition[0] )
static void
Initialize_Signal_Handler( void )
{
- /* Signal-Handler initialisieren: einige Signale
- * werden ignoriert, andere speziell behandelt. */
-
#ifdef HAVE_SIGACTION
- /* sigaction() ist vorhanden */
-
struct sigaction saction;
- /* Signal-Struktur initialisieren */
memset( &saction, 0, sizeof( saction ));
saction.sa_handler = Signal_Handler;
#ifdef SA_RESTART
saction.sa_flags |= SA_NOCLDWAIT;
#endif
- /* Signal-Handler einhaengen */
sigaction(SIGINT, &saction, NULL);
sigaction(SIGQUIT, &saction, NULL);
sigaction(SIGTERM, &saction, NULL);
sigaction(SIGHUP, &saction, NULL);
sigaction(SIGCHLD, &saction, NULL);
- /* einige Signale ignorieren */
+ /* we handle write errors properly; ignore SIGPIPE */
saction.sa_handler = SIG_IGN;
sigaction(SIGPIPE, &saction, NULL);
#else
- /* kein sigaction() vorhanden */
-
- /* Signal-Handler einhaengen */
signal(SIGINT, Signal_Handler);
signal(SIGQUIT, Signal_Handler);
signal(SIGTERM, Signal_Handler);
signal(SIGHUP, Signal_Handler);
signal(SIGCHLD, Signal_Handler);
- /* einige Signale ignorieren */
signal(SIGPIPE, SIG_IGN);
#endif
} /* Initialize_Signal_Handler */
case SIGTERM:
case SIGINT:
case SIGQUIT:
- /* wir soll(t)en uns wohl beenden ... */
+ /* shut down sever */
NGIRCd_SignalQuit = true;
break;
case SIGHUP:
- /* Konfiguration neu einlesen: */
+ /* re-read configuration */
NGIRCd_SignalRehash = true;
break;
case SIGCHLD:
- /* Child-Prozess wurde beendet. Zombies vermeiden: */
- while( waitpid( -1, NULL, WNOHANG ) > 0);
+ /* child-process exited, avoid zombies */
+ while (waitpid( -1, NULL, WNOHANG) > 0)
+ ;
break;
#ifdef DEBUG
default:
Show_Version( void )
{
puts( NGIRCd_Version );
- puts( "Copyright (c)2001-20
08 Alexander Barton (<alex@barton.de>) and Contributors." );
+ puts( "Copyright (c)2001-20
10 Alexander Barton (<alex@barton.de>) and Contributors." );
puts( "Homepage: <http://ngircd.barton.de/>\n" );
puts( "This is free software; see the source for copying conditions. There is NO" );
puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." );
* Redirect stdin, stdout and stderr to apropriate file handles.
*/
static void
-Setup_FDStreams( void )
+Setup_FDStreams(int fd)
{
- int fd;
-
- /* Test if we can open /dev/null for reading and writing. If not
- * we are most probably chrooted already and the server has been
- * restarted. So we simply don't try to redirect stdXXX ... */
- fd = open( "/dev/null", O_RDWR );
- if ( fd < 0 ) {
- Log(LOG_WARNING, "Could not open /dev/null: %s", strerror(errno));
+ if (fd < 0)
return;
- }
fflush(stdout);
fflush(stderr);
/* Create new stdin(0), stdout(1) and stderr(2) descriptors */
dup2( fd, 0 ); dup2( fd, 1 ); dup2( fd, 2 );
-
- /* Close newly opened file descriptor if not stdin/out/err */
- if( fd > 2 ) close( fd );
} /* Setup_FDStreams */
bool chrooted = false;
struct passwd *pwd;
struct group *grp;
- int real_errno;
+ int real_errno, fd = -1;
pid_t pid;
if (initialized)
return true;
+ if (!NGIRCd_NoDaemon) {
+ /* open /dev/null before chroot() */
+ fd = open( "/dev/null", O_RDWR);
+ if (fd < 0)
+ Log(LOG_WARNING, "Could not open /dev/null: %s", strerror(errno));
+ }
+
if (!ConnSSL_InitLibrary())
Log(LOG_WARNING,
"Warning: Error during SSL initialization, continuing ...");
if( Conf_Chroot[0] ) {
if( chdir( Conf_Chroot ) != 0 ) {
Log( LOG_ERR, "Can't chdir() in ChrootDir (%s): %s", Conf_Chroot, strerror( errno ));
- return false;
+ goto out;
}
if( chroot( Conf_Chroot ) != 0 ) {
if (errno != EPERM) {
Log( LOG_ERR, "Can't change root directory to \"%s\": %s",
Conf_Chroot, strerror( errno ));
-
- return false;
+ goto out;
}
} else {
chrooted = true;
if (! NGIRCd_getNobodyID(&Conf_UID, &Conf_GID)) {
Log(LOG_WARNING, "Could not get user/group ID of user \"nobody\": %s",
errno ? strerror(errno) : "not found" );
- return false;
+ goto out;
}
}
real_errno = errno;
Log( LOG_ERR, "Can't change group ID to %u: %s", Conf_GID, strerror( errno ));
if (real_errno != EPERM)
- return false;
+ goto out;
}
}
real_errno = errno;
Log(LOG_ERR, "Can't change user ID to %u: %s", Conf_UID, strerror(errno));
if (real_errno != EPERM)
- return false;
+ goto out;
}
}
#else
setpgrp(0, getpid());
#endif
- chdir( "/" );
+ if (chdir( "/" ) != 0)
+ Log(LOG_ERR, "Can't change directory to '/': %s",
+ strerror(errno));
/* Detach stdin, stdout and stderr */
- Setup_FDStreams( );
+ Setup_FDStreams(fd);
+ if (fd > 2) {
+ close(fd);
+ fd = -1;
+ }
}
pid = getpid();
pwd = getpwuid( Conf_UID );
grp = getgrgid( Conf_GID );
- Log( LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.",
- pwd ? pwd->pw_name : "unknown", Conf_UID,
- grp ? grp->gr_name : "unknown", Conf_GID, pid);
+ Log(LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.",
+ pwd ? pwd->pw_name : "unknown", (long)Conf_UID,
+ grp ? grp->gr_name : "unknown", (long)Conf_GID, (long)pid);
if (chrooted) {
Log(LOG_INFO, "Running with root directory \"%s\".",
/* Change working directory to home directory of the user
* we are running as (only when running in daemon mode and not in chroot) */
-
- if ( pwd ) {
+
+ if (pwd) {
if (!NGIRCd_NoDaemon ) {
if( chdir( pwd->pw_dir ) == 0 )
Log( LOG_DEBUG, "Changed working directory to \"%s\" ...", pwd->pw_dir );
Log( LOG_ERR, "Can't get user informaton for UID %d!?", Conf_UID );
}
-return true;
+ return true;
+ out:
+ if (fd > 2)
+ close(fd);
+ return false;
}
/* -eof- */
projects / ngircd-alex.git / blobdiff