diff --git a/hermes.c b/hermes.c index 5a95b74..a619686 100644 --- a/hermes.c +++ b/hermes.c @@ -25,7 +25,7 @@ #include "petidomo.h" int -hermes_main(char * incoming_mail, const char * listname, char is_approved) +hermes_main(char * incoming_mail, const char * listname) { const struct PD_Config * MasterConfig; const struct List_Config * ListConfig; diff --git a/listserv.c b/listserv.c index 2d452b7..ef235da 100644 --- a/listserv.c +++ b/listserv.c @@ -26,7 +26,7 @@ char * g_currLine; /* pointer to the line currently parsed */ int -listserv_main(char * incoming_mail, char * default_list, char is_approved) +listserv_main(char * incoming_mail, char * default_list) { const struct List_Config * ListConfig; struct Mail * MailStruct; diff --git a/main.c b/main.c index 1a990ce..bedea4a 100644 --- a/main.c +++ b/main.c @@ -33,7 +33,7 @@ static char* listname = NULL; static char* mode = NULL; static char* masterconfig_path = SYSCONFDIR "/petidomo.conf"; -static char is_approved = ARGV_FALSE; +char g_is_approved = ARGV_FALSE; int main(int argc, char * argv[]) @@ -45,7 +45,7 @@ main(int argc, char * argv[]) {ARGV_MAND, "mode", ARGV_CHAR_P, &mode, "mode", "listserv, deliver, or approve."}, {ARGV_MAYBE, "listname", ARGV_CHAR_P, &listname, "listname", "Default mailing list."}, {ARGV_MAYBE, "masterconf", ARGV_CHAR_P, &masterconfig_path, "masterconf", "Path to petidomo.conf."}, - {ARGV_MAYBE, "approved", ARGV_BOOL, &is_approved, "approved", "approved flag."}, + {ARGV_MAYBE, "approved", ARGV_BOOL, &g_is_approved, "approved", "approved flag."}, {ARGV_LAST} }; @@ -80,11 +80,11 @@ main(int argc, char * argv[]) /* Now decide what we actually do with the mail. */ if (strcasecmp("listserv", mode) == 0) - listserv_main(incoming_mail, listname, is_approved); + listserv_main(incoming_mail, listname); else if (strcasecmp("deliver", mode) == 0) { if (listname != NULL) - hermes_main(incoming_mail, listname, is_approved); + hermes_main(incoming_mail, listname); else { syslog(LOG_ERR, "Wrong command line syntax; deliver mode requires a parameter."); diff --git a/petidomo.h b/petidomo.h index 0b5d6e0..a13ad11 100644 --- a/petidomo.h +++ b/petidomo.h @@ -48,6 +48,10 @@ # include #endif +/********** main.c **********/ + +extern char g_is_approved; + /********** config.c **********/ struct PD_Config @@ -185,7 +189,7 @@ int savefile(const char *filename, const char *buffer); /********** listserv.c **********/ -int listserv_main(char *incoming_mail, char *default_list, char); +int listserv_main(char *incoming_mail, char *default_list); /********** mailer.c **********/ @@ -215,7 +219,7 @@ int DeleteAddress(struct Mail *MailStruct, const char *param1, const char *param /********** hermes.c **********/ -int hermes_main(char *incoming_mail, const char *listname, char); +int hermes_main(char *incoming_mail, const char *listname); /********** subscribe.c **********/