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

ban: Fix build breakage.

Browse source 
A normal 'make' did not rebuild m_ban.c even though dependencies had
changed.
This commit is contained in:
Jilles Tjoelker 2014-09-21 18:28:24 +02:00
parent 36e50ccfa5
commit 2a17ae5483
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/core/m_ban.c
View file

@ -85,11 +85,12 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
struct ConfItem *aconf; struct ConfItem *aconf;
unsigned int ntype; unsigned int ntype;
const char *oper, *stype; const char *oper, *stype;
time_t created, hold, lifetime; time_t now, created, hold, lifetime;
char *p; char *p;
int act; int act;
int valid; int valid;
now = rb_current_time();
if (strlen(parv[1]) != 1) if (strlen(parv[1]) != 1)
{ {
sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
@ -149,14 +150,14 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
* is not a removal and not already expired. * is not a removal and not already expired.
*/ */
act = !(aconf->status & CONF_ILLEGAL) || (hold != created && act = !(aconf->status & CONF_ILLEGAL) || (hold != created &&
hold > rb_current_time()); hold > now);
if (lifetime > aconf->lifetime) if (lifetime > aconf->lifetime)
aconf->lifetime = lifetime; aconf->lifetime = lifetime;
/* already expired, hmm */ /* already expired, hmm */
if (aconf->lifetime <= rb_current_time()) if (aconf->lifetime <= now)
return 0; return 0;
/* Deactivate, it will be reactivated later if appropriate. */ /* Deactivate, it will be reactivated later if appropriate. */
deactivate_conf(aconf, ptr); deactivate_conf(aconf, ptr, now);
rb_free(aconf->user); rb_free(aconf->user);
aconf->user = NULL; aconf->user = NULL;
rb_free(aconf->host); rb_free(aconf->host);
@ -175,7 +176,7 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
aconf->status = CONF_ILLEGAL | ntype; aconf->status = CONF_ILLEGAL | ntype;
aconf->lifetime = lifetime; aconf->lifetime = lifetime;
rb_dlinkAddAlloc(aconf, &prop_bans); rb_dlinkAddAlloc(aconf, &prop_bans);
act = hold != created && hold > rb_current_time(); act = hold != created && hold > now;
} }
aconf->flags &= ~CONF_FLAGS_MYOPER; aconf->flags &= ~CONF_FLAGS_MYOPER;
aconf->flags |= CONF_FLAGS_TEMPORARY; aconf->flags |= CONF_FLAGS_TEMPORARY;
@ -214,7 +215,7 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
{ {
sendto_realops_snomask(SNO_GENERAL, L_ALL, sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Ignoring global %d min. %s from %s%s%s for [%s%s%s]: too few non-wildcard characters", "Ignoring global %d min. %s from %s%s%s for [%s%s%s]: too few non-wildcard characters",
(int)((hold - rb_current_time()) / 60), (int)((hold - now) / 60),
stype, stype,
IsServer(source_p) ? source_p->name : get_oper_name(source_p), IsServer(source_p) ? source_p->name : get_oper_name(source_p),
strcmp(parv[7], "*") ? " on behalf of " : "", strcmp(parv[7], "*") ? " on behalf of " : "",
@ -237,7 +238,7 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
sendto_realops_snomask(SNO_GENERAL, L_ALL, sendto_realops_snomask(SNO_GENERAL, L_ALL,
"%s added global %d min. %s%s%s for [%s%s%s] [%s]", "%s added global %d min. %s%s%s for [%s%s%s] [%s]",
IsServer(source_p) ? source_p->name : get_oper_name(source_p), IsServer(source_p) ? source_p->name : get_oper_name(source_p),
(int)((hold - rb_current_time()) / 60), (int)((hold - now) / 60),
stype, stype,
strcmp(parv[7], "*") ? " from " : "", strcmp(parv[7], "*") ? " from " : "",
strcmp(parv[7], "*") ? parv[7] : "", strcmp(parv[7], "*") ? parv[7] : "",
@ -247,7 +248,7 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
parv[parc - 1]); parv[parc - 1]);
ilog(L_KLINE, "%s %s %d %s%s%s %s", parv[1], ilog(L_KLINE, "%s %s %d %s%s%s %s", parv[1],
IsServer(source_p) ? source_p->name : get_oper_name(source_p), IsServer(source_p) ? source_p->name : get_oper_name(source_p),
(int)((hold - rb_current_time()) / 60), (int)((hold - now) / 60),
aconf->user ? aconf->user : "", aconf->user ? aconf->user : "",
aconf->user ? " " : "", aconf->user ? " " : "",
aconf->host, aconf->host,
@ -313,7 +314,7 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
if (!(aconf->status & CONF_ILLEGAL)) if (!(aconf->status & CONF_ILLEGAL))
{ {
add_to_resv_hash(aconf->host, aconf); add_to_resv_hash(aconf->host, aconf);
resv_chan_forcepart(aconf->host, aconf->passwd, hold - rb_current_time()); resv_chan_forcepart(aconf->host, aconf->passwd, hold - now);
} }
break; break;
case CONF_RESV_NICK: case CONF_RESV_NICK: