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

conf.c: code cleanup

This commit is contained in:
Alexander Barton 2011-06-25 14:55:34 +02:00
parent 7ef6cb4584
commit 391cf4e2a1
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/ngircd/conf.c
View File

@ -302,12 +302,11 @@ Conf_Test( void )
config_valid = Validate_Config(true, false); config_valid = Validate_Config(true, false);
/* Valid tty? */ /* Valid tty? */
if( isatty( fileno( stdin )) && isatty( fileno( stdout ))) { if(isatty(fileno(stdin)) && isatty(fileno(stdout))) {
puts( "OK, press enter to see a dump of your service configuration ..." ); puts("OK, press enter to see a dump of your server configuration ...");
getchar( ); getchar();
} else { } else
puts( "Ok, dump of your server configuration follows:\n" ); puts("Ok, dump of your server configuration follows:\n");
}
puts("[GLOBAL]"); puts("[GLOBAL]");
printf(" Name = %s\n", Conf_ServerName); printf(" Name = %s\n", Conf_ServerName);
@ -881,7 +880,9 @@ Read_Config( bool ngircd_starting )
continue; continue;
} }
Config_Error( LOG_ERR, "%s, line %d: Unknown section \"%s\"!", NGIRCd_ConfFile, line, section ); Config_Error(LOG_ERR,
"%s, line %d: Unknown section \"%s\"!",
NGIRCd_ConfFile, line, section);
section[0] = 0x1; section[0] = 0x1;
} }
if( section[0] == 0x1 ) continue; if( section[0] == 0x1 ) continue;
@ -1050,8 +1051,8 @@ WarnPAM(int UNUSED Line)
/** /**
* Handle legacy "NoXXX" options in [GLOBAL] section. * Handle legacy "NoXXX" options in [GLOBAL] section.
* *
* TODO: This function and support for "NoXXX" should be removed starting * TODO: This function and support for "NoXXX" could be removed starting
* with ngIRCd release 19! (One release after marking it "deprecated"). * with ngIRCd release 19 (one release after marking it "deprecated").
* *
* @param Var Variable name. * @param Var Variable name.
* @param Arg Argument string. * @param Arg Argument string.
@ -1060,7 +1061,7 @@ WarnPAM(int UNUSED Line)
static bool static bool
CheckLegacyNoOption(const char *Var, const char *Arg) CheckLegacyNoOption(const char *Var, const char *Arg)
{ {
if( strcasecmp( Var, "NoDNS" ) == 0 ) { if(strcasecmp(Var, "NoDNS") == 0) {
Conf_DNS = !Check_ArgIsTrue( Arg ); Conf_DNS = !Check_ArgIsTrue( Arg );
return true; return true;
} }
@ -1168,9 +1169,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
size_t len; size_t len;
const char *section; const char *section;
assert( Line > 0 ); assert(Line > 0);
assert( Var != NULL ); assert(Var != NULL);
assert( Arg != NULL ); assert(Arg != NULL);
if (strcasecmp(Var, "Name") == 0) { if (strcasecmp(Var, "Name") == 0) {
len = strlcpy(Conf_ServerName, Arg, sizeof(Conf_ServerName)); len = strlcpy(Conf_ServerName, Arg, sizeof(Conf_ServerName));
@ -1232,12 +1233,13 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
if (len == 0) if (len == 0)
return; return;
if (len >= LINE_LEN) { if (len >= LINE_LEN) {
Config_Error_TooLong( Line, Var ); Config_Error_TooLong(Line, Var);
return; return;
} }
if (!array_copyb(&Conf_Motd, Arg, len + 1)) if (!array_copyb(&Conf_Motd, Arg, len + 1))
Config_Error(LOG_WARNING, "%s, line %d: Could not append MotdPhrase: %s", Config_Error(LOG_WARNING,
NGIRCd_ConfFile, Line, strerror(errno)); "%s, line %d: Could not append MotdPhrase: %s",
NGIRCd_ConfFile, Line, strerror(errno));
Using_MotdFile = false; Using_MotdFile = false;
return; return;
} }
@ -1281,8 +1283,12 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
} }
if (CheckLegacyNoOption(Var, Arg)) { if (CheckLegacyNoOption(Var, Arg)) {
Config_Error(LOG_WARNING, "%s, line %d: \"No\"-Prefix has been removed, use \"%s = %s\" in [FEATURES] section instead", /* TODO: This function and support for "NoXXX" could be
NGIRCd_ConfFile, Line, NoNo(Var), InvertArg(Arg)); * be removed starting with ngIRCd release 19 (one release
* after marking it "deprecated"). */
Config_Error(LOG_WARNING,
"%s, line %d (section \"Global\"): \"No\"-Prefix is deprecated, use \"%s = %s\" in [Options] section!",
NGIRCd_ConfFile, Line, NoNo(Var), InvertArg(Arg));
if (strcasecmp(Var, "NoIdent") == 0) if (strcasecmp(Var, "NoIdent") == 0)
WarnIdent(Line); WarnIdent(Line);
else if (strcasecmp(Var, "NoPam") == 0) else if (strcasecmp(Var, "NoPam") == 0)