before people had to create a /dev/null inside the chroot to make
redirection work.
static void Fill_Version PARAMS(( void ));
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 ));
static bool NGIRCd_Init PARAMS(( bool ));
* Redirect stdin, stdout and stderr to apropriate file handles.
*/
static void
* Redirect stdin, stdout and stderr to apropriate file handles.
*/
static void
- 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));
fflush(stdout);
fflush(stderr);
/* Create new stdin(0), stdout(1) and stderr(2) descriptors */
dup2( fd, 0 ); dup2( fd, 1 ); dup2( fd, 2 );
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 );
bool chrooted = false;
struct passwd *pwd;
struct group *grp;
bool chrooted = false;
struct passwd *pwd;
struct group *grp;
+ int real_errno, fd = -1;
pid_t pid;
if (initialized)
return true;
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 (!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 ));
if( Conf_Chroot[0] ) {
if( chdir( Conf_Chroot ) != 0 ) {
Log( LOG_ERR, "Can't chdir() in ChrootDir (%s): %s", Conf_Chroot, strerror( errno ));
}
if( chroot( Conf_Chroot ) != 0 ) {
if (errno != EPERM) {
Log( LOG_ERR, "Can't change root directory to \"%s\": %s",
Conf_Chroot, strerror( errno ));
}
if( chroot( Conf_Chroot ) != 0 ) {
if (errno != EPERM) {
Log( LOG_ERR, "Can't change root directory to \"%s\": %s",
Conf_Chroot, strerror( errno ));
}
} else {
chrooted = true;
}
} 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" );
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" );
real_errno = errno;
Log( LOG_ERR, "Can't change group ID to %u: %s", Conf_GID, strerror( errno ));
if (real_errno != EPERM)
real_errno = errno;
Log( LOG_ERR, "Can't change group ID to %u: %s", Conf_GID, strerror( errno ));
if (real_errno != EPERM)
real_errno = errno;
Log(LOG_ERR, "Can't change user ID to %u: %s", Conf_UID, strerror(errno));
if (real_errno != EPERM)
real_errno = errno;
Log(LOG_ERR, "Can't change user ID to %u: %s", Conf_UID, strerror(errno));
if (real_errno != EPERM)
strerror(errno));
/* Detach stdin, stdout and stderr */
strerror(errno));
/* Detach stdin, stdout and stderr */
+ Setup_FDStreams(fd);
+ if (fd > 2) {
+ close(fd);
+ fd = -1;
+ }
/* Change working directory to home directory of the user
* we are running as (only when running in daemon mode and not in chroot) */
/* Change working directory to home directory of the user
* we are running as (only when running in daemon mode and not in chroot) */
if (!NGIRCd_NoDaemon ) {
if( chdir( pwd->pw_dir ) == 0 )
Log( LOG_DEBUG, "Changed working directory to \"%s\" ...", pwd->pw_dir );
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 );
}
Log( LOG_ERR, "Can't get user informaton for UID %d!?", Conf_UID );
}
+ return true;
+ out:
+ if (fd > 2)
+ close(fd);
+ return false;