Commit Diff
Diff:
d29e389779dfeda52cb42e8b8f2cf36c4bd9cd56
f99d33ddd93b41eca3fd113ba5308cffdba58142
Commit:
f99d33ddd93b41eca3fd113ba5308cffdba58142
Tree:
10df4a47c6db6b0b61ef178f6e3da0a0392a9ac2
Author:
Alexander Barton <alex@barton.de>
Committer:
Alexander Barton <alex@barton.de>
Date:
Sat Mar 26 16:11:44 2011 UTC
Message:
Configuration: move "NoticeAuth" to GLOBAL section
blob - 85e42335dabad0ef26bd64daa0eea3930d5b9b7b
blob + 568b9e7a9bb2d068de5a35399af2328799e702bf
--- src/ngircd/conf.c
+++ src/ngircd/conf.c
@@ -352,6 +352,7 @@ Conf_Test( void )
printf(" MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP);
printf(" MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1);
printf(" MaxNickLength = %u\n", Conf_MaxNickLength - 1);
+ printf(" NoticeAuth = %s\n", yesno_to_str(Conf_NoticeAuth));
printf(" CloakHost = %s\n", Conf_CloakHost);
printf(" CloakUserToNick = %s\n\n", yesno_to_str(Conf_CloakUserToNick));
@@ -359,7 +360,6 @@ Conf_Test( void )
printf(" DNS = %s\n", yesno_to_str(Conf_DNS));
printf(" Ident = %s\n", yesno_to_str(Conf_Ident));
printf(" PAM = %s\n", yesno_to_str(Conf_PAM));
- printf(" NoticeAuth = %s\n", yesno_to_str(Conf_NoticeAuth));
puts("");
opers_puts();
@@ -1194,6 +1194,11 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
Conf_MaxNickLength = Handle_MaxNickLength(Line, Arg);
return;
}
+ if(strcasecmp(Var, "NoticeAuth") == 0) {
+ /* send NOTICE AUTH messages to clients on connect */
+ Conf_NoticeAuth = Check_ArgIsTrue(Arg);
+ return;
+ }
if( strcasecmp( Var, "Listen" ) == 0 ) {
/* IP-Address to bind sockets */
@@ -1280,11 +1285,6 @@ Handle_FEATURES(int Line, char *Var, char *Arg)
WarnPAM(Line);
return;
}
- if(strcasecmp(Var, "NoticeAuth") == 0) {
- /* send NOTICE AUTH messages to clients on connect */
- Conf_NoticeAuth = Check_ArgIsTrue(Arg);
- return;
- }
Config_Error(LOG_ERR,
"%s, line %d (section \"Features\"): Unknown variable \"%s\"!",
IRCNow