albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do not add default listening port if ssl ports were specified 

Cosmo Kastemaa reported that its impossible to create an ssl-only setup,
as ngircd binds to port 6667 by default, even if setting "Ports =".

Only add the default port if _both_ "Ports" and "SSLPorts" are
unspecified.

Fixes bugzilla #98.
This commit is contained in:
Florian Westphal 2009-08-31 19:42:59 +02:00
parent 5f1e43416a
commit cf7e19193b
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
man/ngircd.conf.5.tmpl
View File

@ -75,7 +75,8 @@ command.
.TP
\fBPorts\fR
Ports on which the server should listen. There may be more than one port,
separated with commas (","). Default: 6667.
separated with commas (","). Default: 6667, unless \fBSSL_Ports\fR are also
specified.
.TP
\fBSSLPorts\fR
Same as \fBPorts\fR , except that ngIRCd will expect incoming connections

24
src/ngircd/conf.c
View File

@ -542,6 +542,16 @@ Set_Defaults( bool InitServers )
} /* Set_Defaults */
static bool
no_listenports(void)
{
unsigned int cnt = array_bytes(&Conf_ListenPorts);
#ifdef SSL_SUPPORT
cnt += array_bytes(&Conf_SSLOptions.ListenPorts);
#endif
return cnt == 0;
}
static bool
Read_Config( bool ngircd_starting )
{
@ -698,12 +708,14 @@ Read_Config( bool ngircd_starting )
Conf_Server[New_Server_Idx] = New_Server;
}
if (0 == array_length(&Conf_ListenPorts, sizeof(UINT16))) {
if (!array_copyb(&Conf_ListenPorts, (char*) &defaultport, sizeof defaultport)) {
Config_Error( LOG_ALERT, "Could not add default listening Port %u: %s",
(unsigned int) defaultport, strerror(errno));
exit( 1 );
}
/* not a single listening port? Add default. */
if (no_listenports() &&
!array_copyb(&Conf_ListenPorts, (char*) &defaultport, sizeof defaultport))
{
Config_Error(LOG_ALERT, "Could not add default listening Port %u: %s",
(unsigned int) defaultport, strerror(errno));
exit(1);
}
if (!Conf_ListenAddress)