Show D:line oper reason in /testline.

This commit is contained in:
Jilles Tjoelker 2009-01-27 20:20:37 +01:00
parent 03a905bd21
commit c70fcd85f7
1 changed files with 6 additions and 3 deletions

View File

@ -71,6 +71,8 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
int host_mask; int host_mask;
int type; int type;
int duration; int duration;
char *puser, *phost, *reason, *operreason;
char reasonbuf[BUFSIZE];
mask = LOCAL_COPY(parv[1]); mask = LOCAL_COPY(parv[1]);
@ -129,12 +131,15 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
if(aconf && aconf->status & CONF_DLINE) if(aconf && aconf->status & CONF_DLINE)
{ {
get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
rb_snprintf(reasonbuf, sizeof(reasonbuf), "%s%s%s", reason,
operreason ? "|" : "", operreason ? operreason : "");
sendto_one(source_p, form_str(RPL_TESTLINE), sendto_one(source_p, form_str(RPL_TESTLINE),
me.name, source_p->name, me.name, source_p->name,
(aconf->flags & CONF_FLAGS_TEMPORARY) ? 'd' : 'D', (aconf->flags & CONF_FLAGS_TEMPORARY) ? 'd' : 'D',
(aconf->flags & CONF_FLAGS_TEMPORARY) ? (aconf->flags & CONF_FLAGS_TEMPORARY) ?
(long) ((aconf->hold - rb_current_time()) / 60) : 0L, (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
aconf->host, aconf->passwd); phost, reasonbuf);
return 0; return 0;
} }
@ -178,8 +183,6 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
if(aconf->status & CONF_KILL) if(aconf->status & CONF_KILL)
{ {
char *puser, *phost, *reason, *operreason;
char reasonbuf[BUFSIZE];
get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason); get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
rb_snprintf(buf, sizeof(buf), "%s@%s", rb_snprintf(buf, sizeof(buf), "%s@%s",
puser, phost); puser, phost);