Rename ShowInvitesBans() to ShowChannelList(), make it more flexible

[ngircd-alex.git] / src / ngircd / conf.c

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index b930b6c887d3237fdb1accaded002b6e33a2c8ac..f18016b5c13f7a852ca61ce688a0048980370ef4 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -373,6 +373,7 @@ Conf_Test( void )
        printf("  OperServerMode = %s\n", yesno_to_str(Conf_OperServerMode));
 #ifdef PAM
        printf("  PAM = %s\n", yesno_to_str(Conf_PAM));
+       printf("  PAMIsOptional = %s\n", yesno_to_str(Conf_PAMIsOptional));
 #endif
        printf("  PredefChannelsOnly = %s\n", yesno_to_str(Conf_PredefChannelsOnly));
 #ifndef STRICT_RFC
@@ -697,6 +698,7 @@ Set_Defaults(bool InitServers)
 #else
        Conf_PAM = false;
 #endif
+       Conf_PAMIsOptional = false;
        Conf_PredefChannelsOnly = false;
 #ifdef SYSLOG
        Conf_ScrubCTCP = false;
@@ -1306,7 +1308,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
                else {
                        Conf_GID = (unsigned int)atoi(Arg);
                        if (!Conf_GID && strcmp(Arg, "0"))
-                               Config_Error_NaN(Line, Var);
+                               Config_Error(LOG_WARNING,
+                                            "%s, line %d: Value of \"%s\" is not a valid group name or ID!",
+                                            NGIRCd_ConfFile, Line, Var);
                }
                return;
        }
@@ -1317,7 +1321,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
                else {
                        Conf_UID = (unsigned int)atoi(Arg);
                        if (!Conf_UID && strcmp(Arg, "0"))
-                               Config_Error_NaN(Line, Var);
+                               Config_Error(LOG_WARNING,
+                                            "%s, line %d: Value of \"%s\" is not a valid user name or ID!",
+                                            NGIRCd_ConfFile, Line, Var);
                }
                return;
        }
@@ -1500,6 +1506,10 @@ Handle_OPTIONS(int Line, char *Var, char *Arg)
                WarnPAM(Line);
                return;
        }
+       if (strcasecmp(Var, "PAMIsOptional") == 0 ) {
+               Conf_PAMIsOptional = Check_ArgIsTrue(Arg);
+               return;
+       }
        if (strcasecmp(Var, "PredefChannelsOnly") == 0) {
                Conf_PredefChannelsOnly = Check_ArgIsTrue(Arg);
                return;