commit eda2556e0919e48aa8fb7556383aa81a089b4135 from: Florian Westphal date: Sun Jan 09 17:17:35 2011 UTC conf: Warn if PAM=true when ngircd was built without PAM support commit - 9402bcaa73a9365f861108f1b53eec1c09837eef commit + eda2556e0919e48aa8fb7556383aa81a089b4135 blob - db5286938c1760c88c944d1d9a481ac54114fa09 blob + 5a992eb58830a4b8e4e532c15ccdf2d1f1700277 --- src/ngircd/conf.c +++ src/ngircd/conf.c @@ -899,12 +899,24 @@ WarnIdent(int UNUSED Line) if (Conf_Ident) { /* user has enabled ident lookups explicitly, but ... */ Config_Error(LOG_WARNING, - "%s: line %d: Ident=True, but ngircd was built without IDENT support", - NGIRCd_ConfFile, Line); + "%s: line %d: %s=True, but ngircd was built without support", + NGIRCd_ConfFile, Line, "Ident"); } #endif } +static void +WarnPAM(int UNUSED Line) +{ +#ifndef PAM + if (Conf_PAM) { + Config_Error(LOG_WARNING, + "%s: line %d: %s=True, but ngircd was built without support", + NGIRCd_ConfFile, Line, "PAM"); + } +#endif +} + static bool CheckLegacyNoOption(const char *Var, const char *Arg) { @@ -1109,6 +1121,8 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) NGIRCd_ConfFile, Line, NoNo(Var), InvertArg(Arg)); if (strcasecmp(Var, "NoIdent") == 0) WarnIdent(Line); + else if (strcasecmp(Var, "NoPam") == 0) + WarnPAM(Line); return; } if( strcasecmp( Var, "DNS" ) == 0 ) { @@ -1125,6 +1139,7 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) if(strcasecmp(Var, "PAM") == 0) { /* use PAM library to authenticate users */ Conf_PAM = Check_ArgIsTrue(Arg); + WarnPAM(Line); return; } if(strcasecmp(Var, "ZeroConf") == 0) {