X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/1cc810d3a7bf3f30a6caf13488f581cf93681fb9..ce60772db6eb54b5cc87bbaa5c3b5bf783d59be2:/src/s_conf.c diff --git a/src/s_conf.c b/src/s_conf.c index 4263528..ae83d7a 100644 --- a/src/s_conf.c +++ b/src/s_conf.c @@ -306,6 +306,8 @@ verify_access(struct Client *client_p, const char *username) { struct ConfItem *aconf; char non_ident[USERLEN + 1]; + char reasonbuf[BUFSIZE]; + char *reason; if(IsGotId(client_p)) { @@ -376,9 +378,18 @@ verify_access(struct Client *client_p, const char *username) { if(ConfigFileEntry.kline_with_reason) { + if(aconf->created) + { + snprintf(reasonbuf, sizeof reasonbuf, "%s (%s)", + aconf->passwd, + smalldate(aconf->created)); + reason = reasonbuf; + } + else + reason = aconf->passwd; sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP), - me.name, client_p->name, aconf->passwd); + me.name, client_p->name, reason); } add_reject(client_p, aconf->user, aconf->host); return (BANNED_CLIENT); @@ -1130,11 +1141,19 @@ get_printable_kline(struct Client *source_p, struct ConfItem *aconf, char **user, char **oper_reason) { static char null[] = ""; + static char reasonbuf[BUFSIZE]; *host = EmptyString(aconf->host) ? null : aconf->host; - *reason = EmptyString(aconf->passwd) ? null : aconf->passwd; *user = EmptyString(aconf->user) ? null : aconf->user; + *reason = EmptyString(aconf->passwd) ? null : aconf->passwd; + if(aconf->created) + { + rb_snprintf(reasonbuf, sizeof reasonbuf, "%s (%s)", + *reason, smalldate(aconf->created)); + *reason = reasonbuf; + } + if(EmptyString(aconf->spasswd) || !IsOper(source_p)) *oper_reason = NULL; else