9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include time the k/d line was set in the reason when reading ban confs.

Browse source 
This correspond to what happens when a kline or dline is set.
This commit is contained in:
Jilles Tjoelker 2008-01-02 00:06:08 +01:00
parent cdd5b26189
commit c8de4f0037
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/kdparse.c
View file

@ -37,19 +37,27 @@
/* conf_add_fields() /* conf_add_fields()
* *
* inputs - pointer to config item, host/pass/user/operreason fields * inputs - pointer to config item, host/pass/user/operreason/date fields
* output - NONE * output - NONE
* side effects - update respective fields with pointers * side effects - update respective fields with pointers
*/ */
static void static void
conf_add_fields(struct ConfItem *aconf, const char *host_field, conf_add_fields(struct ConfItem *aconf, const char *host_field,
const char *pass_field, const char *user_field, const char *pass_field, const char *user_field,
const char *operreason_field) const char *operreason_field, const char *date_field)
{ {
if(host_field != NULL) if(host_field != NULL)
DupString(aconf->host, host_field); DupString(aconf->host, host_field);
if(pass_field != NULL) if(pass_field != NULL)
{
if(!EmptyString(date_field))
{
aconf->passwd = MyMalloc(strlen(pass_field) + strlen(date_field) + 4);
ircsprintf(aconf->passwd, "%s (%s)", pass_field, date_field);
}
else
DupString(aconf->passwd, pass_field); DupString(aconf->passwd, pass_field);
}
if(user_field != NULL) if(user_field != NULL)
DupString(aconf->user, user_field); DupString(aconf->user, user_field);
if(operreason_field != NULL) if(operreason_field != NULL)
@ -71,6 +79,7 @@ parse_k_file(FILE * file)
char *reason_field = NULL; char *reason_field = NULL;
char *operreason_field = NULL; char *operreason_field = NULL;
char *host_field = NULL; char *host_field = NULL;
char *date_field = NULL;
char line[BUFSIZE]; char line[BUFSIZE];
char *p; char *p;
@ -95,11 +104,12 @@ parse_k_file(FILE * file)
continue; continue;
operreason_field = getfield(NULL); operreason_field = getfield(NULL);
date_field = getfield(NULL);
aconf = make_conf(); aconf = make_conf();
aconf->status = CONF_KILL; aconf->status = CONF_KILL;
conf_add_fields(aconf, host_field, reason_field, conf_add_fields(aconf, host_field, reason_field,
user_field, operreason_field); user_field, operreason_field, date_field);
if(aconf->host != NULL) if(aconf->host != NULL)
add_conf_by_address(aconf->host, CONF_KILL, aconf->user, aconf); add_conf_by_address(aconf->host, CONF_KILL, aconf->user, aconf);
@ -120,6 +130,7 @@ parse_d_file(FILE * file)
char *reason_field = NULL; char *reason_field = NULL;
char *host_field = NULL; char *host_field = NULL;
char *operreason_field = NULL; char *operreason_field = NULL;
char *date_field = NULL;
char line[BUFSIZE]; char line[BUFSIZE];
char *p; char *p;
@ -140,10 +151,11 @@ parse_d_file(FILE * file)
continue; continue;
operreason_field = getfield(NULL); operreason_field = getfield(NULL);
date_field = getfield(NULL);
aconf = make_conf(); aconf = make_conf();
aconf->status = CONF_DLINE; aconf->status = CONF_DLINE;
conf_add_fields(aconf, host_field, reason_field, "", operreason_field); conf_add_fields(aconf, host_field, reason_field, "", operreason_field, date_field);
conf_add_d_conf(aconf); conf_add_d_conf(aconf);
} }
} }