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

Check for redability of SSL-related files like for MOTD file 

Remove functions ssl_print_configvar() and ConfSSL_Puts(), introduce
new function CheckFileReadable().
This commit is contained in:
Alexander Barton 2011-06-25 14:50:52 +02:00
parent e7256bb8ac
commit 7ef6cb4584
1 changed files with 18 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/ngircd/conf.c
View File

@ -109,56 +109,24 @@ ConfSSL_Init(void)
} }
/** /**
* Output SSL configuration variable containing a file name. * Make sure that a configured file is readable.
* And make sure that the given file is readable.
* *
* @returns true when the file is readable. * Currently, this function is only used for SSL-related options ...
*
* @param Var Configuration variable
* @param Filename Configured filename
*/ */
static bool static void
ssl_print_configvar(const char *name, const char *file) CheckFileReadable(const char *Var, const char *Filename)
{ {
FILE *fp; FILE *fp;
if (!file) { fp = fopen(Filename, "r");
printf(" %s =\n", name);
return true;
}
fp = fopen(file, "r");
if (fp) if (fp)
fclose(fp); fclose(fp);
else else
fprintf(stderr, "ERROR: %s \"%s\": %s\n", Config_Error(LOG_ERR, "Can't read \"%s\" (\"%s\"): %s",
name, file, strerror(errno)); Filename, Var, strerror(errno));
printf(" %s = %s\n", name, file);
return fp != NULL;
}
/**
* Output SSL-related configuration variables.
*
* @returns true when all SSL-related configuration variables are valid.
*/
static bool
ConfSSL_Puts(void)
{
bool ret;
ret = ssl_print_configvar("SSLKeyFile", Conf_SSLOptions.KeyFile);
if (!ssl_print_configvar("SSLCertFile", Conf_SSLOptions.CertFile))
ret = false;
if (!ssl_print_configvar("SSLDHFile", Conf_SSLOptions.DHFile))
ret = false;
if (array_bytes(&Conf_SSLOptions.KeyFilePassword))
puts(" SSLKeyFilePassword = <secret>");
array_free_wipe(&Conf_SSLOptions.KeyFilePassword);
return ret;
} }
#endif #endif
@ -977,6 +945,14 @@ Read_Config( bool ngircd_starting )
/* No MOTD phrase configured? (re)try motd file. */ /* No MOTD phrase configured? (re)try motd file. */
if (array_bytes(&Conf_Motd) == 0) if (array_bytes(&Conf_Motd) == 0)
Read_Motd(Conf_MotdFile); Read_Motd(Conf_MotdFile);
#ifdef SSL_SUPPORT
/* Make sure that all SSL-related files are readable */
CheckFileReadable("SSLCertFile", Conf_SSLOptions.CertFile);
CheckFileReadable("SSLDHFile", Conf_SSLOptions.DHFile);
CheckFileReadable("SSLKeyFile", Conf_SSLOptions.KeyFile);
#endif
return true; return true;
} }