From a340dcf7674a713516165e82ba580ae2bae932ac Mon Sep 17 00:00:00 2001 From: Chris Porter Date: Wed, 9 Aug 2023 23:50:17 +0100 Subject: [PATCH 1/2] JUPE: ircd JUPE_MAX_EXPIRE is 7 days --- jupe/jupe.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupe/jupe.h b/jupe/jupe.h index 1d02c158..19488992 100644 --- a/jupe/jupe.h +++ b/jupe/jupe.h @@ -9,7 +9,7 @@ typedef struct jupe_s { extern jupe_t *jupes; -#define JUPE_MAX_EXPIRE 6048000 +#define JUPE_MAX_EXPIRE 604800 #define JUPE_ACTIVE 0x0001 From de082ed5a3a1a82162e2323b5c8cac36e085e141 Mon Sep 17 00:00:00 2001 From: Chris Porter Date: Wed, 9 Aug 2023 23:50:32 +0100 Subject: [PATCH 2/2] JUPE: fix expiry bugs in jupe module --- jupe/jupe_commands.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jupe/jupe_commands.c b/jupe/jupe_commands.c index ec653d2d..293d68c9 100644 --- a/jupe/jupe_commands.c +++ b/jupe/jupe_commands.c @@ -13,6 +13,8 @@ int ju_addjupe(void *source, int cargc, char **cargv) { return CMD_USAGE; } + jupe_expire(); + if (jupe_find(cargv[0]) != NULL) { controlreply(np, "There is already a jupe for that server."); return CMD_OK; @@ -44,6 +46,8 @@ int ju_activatejupe(void *source, int cargc, char **cargv) { return CMD_USAGE; } + jupe_expire(); + jupe = jupe_find(cargv[0]); if (jupe == NULL) { @@ -72,6 +76,8 @@ int ju_deactivatejupe(void *source, int cargc, char **cargv) { return CMD_USAGE; } + jupe_expire(); + jupe = jupe_find(cargv[0]); if (jupe == NULL) {