ircd/ircd_parser.y
add PRIV_LOCAL_WELCOME PRIV_WELCOME
-diff -r 47d03ce52e8e include/client.h
---- a/include/client.h Tue Mar 23 20:10:46 2010 +0100
-+++ b/include/client.h Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f include/client.h
+--- a/include/client.h
++++ b/include/client.h
@@ -142,6 +142,8 @@
PRIV_USER_PRIVACY, /* oper can bypass user privacy +x etc gives i.e. see real ip's */
PRIV_CHANNEL_PRIVACY, /* oper can bypass channel privacy i.e. can see modes on channels they are not on and channel keys */
PRIV_LAST_PRIV /**< number of privileges */
};
-diff -r 47d03ce52e8e include/handlers.h
---- a/include/handlers.h Tue Mar 23 20:10:46 2010 +0100
-+++ b/include/handlers.h Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f include/handlers.h
+--- a/include/handlers.h
++++ b/include/handlers.h
@@ -138,6 +138,7 @@
extern int m_version(struct Client*, struct Client*, int, char*[]);
extern int m_wallchops(struct Client*, struct Client*, int, char*[]);
extern int ms_whois(struct Client*, struct Client*, int, char*[]);
extern int ms_xquery(struct Client*, struct Client*, int, char*[]);
extern int ms_xreply(struct Client*, struct Client*, int, char*[]);
-diff -r 47d03ce52e8e include/ircd_features.h
---- a/include/ircd_features.h Tue Mar 23 20:10:46 2010 +0100
-+++ b/include/ircd_features.h Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f include/ircd_features.h
+--- a/include/ircd_features.h
++++ b/include/ircd_features.h
@@ -101,6 +101,7 @@
FEAT_IRCD_RES_TIMEOUT,
FEAT_AUTH_TIMEOUT,
FEAT_HIS_STATS_w,
FEAT_HIS_STATS_x,
FEAT_HIS_STATS_y,
-diff -r 47d03ce52e8e include/msg.h
---- a/include/msg.h Tue Mar 23 20:10:46 2010 +0100
-+++ b/include/msg.h Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f include/msg.h
+--- a/include/msg.h
++++ b/include/msg.h
@@ -196,6 +196,10 @@
#define TOK_NOTICE "O"
#define CMD_NOTICE MSG_NOTICE, TOK_NOTICE
#define MSG_WALLCHOPS "WALLCHOPS" /* WC */
#define TOK_WALLCHOPS "WC"
#define CMD_WALLCHOPS MSG_WALLCHOPS, TOK_WALLCHOPS
-diff -r 47d03ce52e8e include/numeric.h
---- a/include/numeric.h Tue Mar 23 20:10:46 2010 +0100
-+++ b/include/numeric.h Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f include/numeric.h
+--- a/include/numeric.h
++++ b/include/numeric.h
@@ -116,6 +116,7 @@
RPL_STATSGLINE 227 Dalnet
RPL_STATSVLINE 227 unreal */
#define ERR_SILELISTFULL 511 /* Undernet extension */
/* ERR_NOTIFYFULL 512 aircd */
/* ERR_TOOMANYWATCH 512 Numeric List: Dalnet */
-diff -r 47d03ce52e8e include/welcome.h
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/welcome.h Tue Mar 23 20:11:20 2010 +0100
-@@ -0,0 +1,60 @@
+diff -r 211f48754a7f include/welcome.h
+--- /dev/null
++++ b/include/welcome.h
+@@ -0,0 +1,63 @@
+#ifndef INCLUDED_welcome_h
+#define INCLUDED_welcome_h
+/*
+
+/* Maximum number of welcome entries (per type; X global, X local) */
+#define WELCOME_MAX_ENTRIES 10
++/* Maximum length of a welcome message */
++#define WELCOMELEN TOPICLEN
+/* Maximum timestamp drift in seconds allowed ahead of our idea of nettime
+ * before we throw a warning to ops
+ */
+/* Describes a Welcome message entry. */
+struct Welcome {
+ time_t timestamp; /**< Timestamp of the welcome */
-+ char text[TOPICLEN + 1]; /**< Message */
++ char text[WELCOMELEN + 1]; /**< Message */
+ char who[ACCOUNTLEN + 1]; /**< Who set it */
+};
+
+#define WELCOME_LOCAL 0x01 /**< welcome is local */
+/** Welcome action flags */
+#define WELCOME_ANNOUNCE 0x02 /**< announce change to users */
++#define WELCOME_INSERT 0x04 /**< insert welcome message, move down all others one place */
+
+extern int welcome_do(struct Client *cptr, struct Client *sptr, char *name, char *text,
-+ char *who, time_t timestamp, unsigned int flags);
++ char *who, time_t timestamp, unsigned int flags, int insert);
+extern void welcome_announce(int name);
+extern void welcome_burst(struct Client *cptr);
+extern int welcome_list(struct Client *sptr, int connect);
+extern void welcome_stats(struct Client *sptr, const struct StatDesc *sd, char *param);
+
+#endif /* INCLUDED_welcome_h */
-diff -r 47d03ce52e8e ircd/Makefile.in
---- a/ircd/Makefile.in Tue Mar 23 20:10:46 2010 +0100
-+++ b/ircd/Makefile.in Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f ircd/Makefile.in
+--- a/ircd/Makefile.in
++++ b/ircd/Makefile.in
@@ -186,6 +186,7 @@
m_wallops.c \
m_wallusers.c \
whocmds.o: whocmds.c ../config.h ../include/whocmds.h \
../include/channel.h ../include/ircd_defs.h ../include/res.h \
../config.h ../include/client.h ../include/dbuf.h ../include/msgq.h \
-diff -r 47d03ce52e8e ircd/client.c
---- a/ircd/client.c Tue Mar 23 20:10:46 2010 +0100
-+++ b/ircd/client.c Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f ircd/client.c
+--- a/ircd/client.c
++++ b/ircd/client.c
@@ -177,6 +177,7 @@
FlagSet(&privs_local, PRIV_WHOX);
FlagSet(&privs_local, PRIV_DISPLAY);
#undef P
{ 0, 0 }
};
-diff -r 47d03ce52e8e ircd/ircd_features.c
---- a/ircd/ircd_features.c Tue Mar 23 20:10:46 2010 +0100
-+++ b/ircd/ircd_features.c Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f ircd/ircd_features.c
+--- a/ircd/ircd_features.c
++++ b/ircd/ircd_features.c
@@ -366,6 +366,7 @@
F_I(IRCD_RES_TIMEOUT, 0, 4, 0),
F_I(AUTH_TIMEOUT, 0, 9, 0),
F_B(HIS_STATS_w, 0, 1, 0),
F_B(HIS_STATS_x, 0, 1, 0),
F_B(HIS_STATS_y, 0, 1, 0),
-diff -r 47d03ce52e8e ircd/ircd_lexer.l
---- a/ircd/ircd_lexer.l Tue Mar 23 20:10:46 2010 +0100
-+++ b/ircd/ircd_lexer.l Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f ircd/ircd_lexer.l
+--- a/ircd/ircd_lexer.l
++++ b/ircd/ircd_lexer.l
@@ -166,6 +166,8 @@
{ "serverinfo", TPRIV_SERVERINFO },
{ "user_privacy", TPRIV_USER_PRIVACY },
{ NULL, 0 }
};
static int ntokens;
-diff -r 47d03ce52e8e ircd/ircd_parser.y
---- a/ircd/ircd_parser.y Tue Mar 23 20:10:46 2010 +0100
-+++ b/ircd/ircd_parser.y Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f ircd/ircd_parser.y
+--- a/ircd/ircd_parser.y
++++ b/ircd/ircd_parser.y
@@ -189,6 +189,7 @@
%token TPRIV_CHANSERV TPRIV_XTRA_OPER TPRIV_NOIDLE TPRIV_FREEFORM TPRIV_PARANOID
%token TPRIV_CHECK TPRIV_WALL TPRIV_CLOSE TPRIV_ROUTE TPRIV_ROUTEINFO TPRIV_SERVERINFO
TPRIV_PARANOID { $$ = PRIV_PARANOID; } ;
yesorno: YES { $$ = 1; } | NO { $$ = 0; };
-diff -r 47d03ce52e8e ircd/m_welcome.c
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/m_welcome.c Tue Mar 23 20:11:20 2010 +0100
-@@ -0,0 +1,288 @@
+diff -r 211f48754a7f ircd/m_welcome.c
+--- /dev/null
++++ b/ircd/m_welcome.c
+@@ -0,0 +1,296 @@
+/*
+ * IRC - Internet Relay Chat, ircd/m_welcome.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+ /* remote listing request, see if it is for me or a remote server
+ * check FEAT_HIS_REMOTE to decide if an ordinary user can do this
+ */
-+ if (parc == 2) {
-+ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, feature_int(FEAT_HIS_REMOTE),
-+ "%C", 1, parc, parv) != HUNTED_ISME)
-+ return 0;
-+ return welcome_list(sptr, 0);
-+ }
++ if ((parc > 1) && (hunt_server_cmd(sptr, CMD_WELCOME, cptr, feature_int(FEAT_HIS_REMOTE),
++ "%C", 1, parc, parv) != HUNTED_ISME))
++ return 0;
+
-+ /* just local listing */
++ /* local listing */
+ return welcome_list(sptr, 0);
+}
+
+ if (!feature_bool(FEAT_WELCOME))
+ return send_reply(sptr, ERR_DISABLED, "WELCOME");
+
-+ /* listing */
-+ if (parc < 2)
-+ return welcome_list(sptr, 0);
-+
+ /* TODO: move feature check here? */
+ /* remote listing request, see if it is for me or a remote server */
-+ if (parc == 2) {
-+ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, "%C", 1, parc, parv) != HUNTED_ISME)
-+ return 0;
++ if ((parc == 2) && (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, "%C", 1, parc, parv) != HUNTED_ISME))
++ return 0;
++
++ /* local listing */
++ if (parc <= 2)
+ return welcome_list(sptr, 0);
-+ }
+
+ /* check PRIVS */
+ /* local - need PRIV LOCAL_WELCOME or WELCOME */
+ name++;
+ flags |= WELCOME_ANNOUNCE;
+ }
-+
++
++ /* check for insert prefix */
++ if (*name == '+') {
++ name++;
++ flags |= WELCOME_INSERT;
++ }
++
+ /* and do it */
-+ return welcome_do(cptr, sptr, name, text, who, timestamp, flags);
++ return welcome_do(cptr, sptr, name, text, who, timestamp, flags, 0);
+}
+
+
+
+ /* remote listing request, see if it is for me or a remote server */
+ if (parc == 2) {
++ if (IsServer(sptr))
++ return protocol_violation(cptr, "WELCOME listing request from server %C", sptr);
+ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, "%C", 1, parc, parv) != HUNTED_ISME)
+ return 0;
+ return welcome_list(sptr, 0);
+ flags |= WELCOME_ANNOUNCE;
+ }
+
++ /* check for insert prefix */
++ if (*name == '+') {
++ name++;
++ flags |= WELCOME_INSERT;
++ }
++
+ /* and do it */
-+ return welcome_do(cptr, sptr, name, text, who, timestamp, flags);
++ return welcome_do(cptr, sptr, name, text, who, timestamp, flags, 0);
+}
-diff -r 47d03ce52e8e ircd/parse.c
---- a/ircd/parse.c Tue Mar 23 20:10:46 2010 +0100
-+++ b/ircd/parse.c Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f ircd/parse.c
+--- a/ircd/parse.c
++++ b/ircd/parse.c
@@ -661,6 +661,15 @@
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
{ m_unregistered, m_not_oper, ms_check, mo_check, m_ignore }
/* This command is an alias for QUIT during the unregistered part of
* of the server. This is because someone jumping via a broken web
-diff -r 47d03ce52e8e ircd/s_err.c
---- a/ircd/s_err.c Tue Mar 23 20:10:46 2010 +0100
-+++ b/ircd/s_err.c Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f ircd/s_err.c
+--- a/ircd/s_err.c
++++ b/ircd/s_err.c
@@ -486,7 +486,7 @@
/* 226 */
{ RPL_STATSALINE, "%s", "226" },
/* 510 */
{ 0 },
/* 511 */
-diff -r 47d03ce52e8e ircd/s_serv.c
---- a/ircd/s_serv.c Tue Mar 23 20:10:46 2010 +0100
-+++ b/ircd/s_serv.c Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f ircd/s_serv.c
+--- a/ircd/s_serv.c
++++ b/ircd/s_serv.c
@@ -57,6 +57,7 @@
#include "struct.h"
#include "sys.h"
/*
* Pass on my client information to the new server
-diff -r 47d03ce52e8e ircd/s_stats.c
---- a/ircd/s_stats.c Tue Mar 23 20:10:46 2010 +0100
-+++ b/ircd/s_stats.c Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f ircd/s_stats.c
+--- a/ircd/s_stats.c
++++ b/ircd/s_stats.c
@@ -54,6 +54,7 @@
#include "send.h"
#include "struct.h"
{ 'x', "memusage", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_x,
stats_meminfo, 0,
"List usage information." },
-diff -r 47d03ce52e8e ircd/s_user.c
---- a/ircd/s_user.c Tue Mar 23 20:10:46 2010 +0100
-+++ b/ircd/s_user.c Tue Mar 23 20:11:20 2010 +0100
+diff -r 211f48754a7f ircd/s_user.c
+--- a/ircd/s_user.c
++++ b/ircd/s_user.c
@@ -63,6 +63,7 @@
#include "userload.h"
#include "version.h"
}
else {
struct Client *acptr = user->server;
-diff -r 47d03ce52e8e ircd/welcome.c
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/welcome.c Tue Mar 23 20:11:20 2010 +0100
-@@ -0,0 +1,369 @@
+diff -r 211f48754a7f ircd/welcome.c
+--- /dev/null
++++ b/ircd/welcome.c
+@@ -0,0 +1,465 @@
+/*
+ * IRC - Internet Relay Chat, ircd/welcome.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+ assert(name >= 0 && name <= 2 * WELCOME_MAX_ENTRIES - 1);
+
+ /* store it */
-+ ircd_strncpy(WelcomeArray[name].text, text, TOPICLEN);
++ ircd_strncpy(WelcomeArray[name].text, text, WELCOMELEN);
+ ircd_strncpy(WelcomeArray[name].who, who, ACCOUNTLEN);
+ WelcomeArray[name].timestamp = timestamp;
+
+ * @param[in] sptr Originator of the welcome.
+ * @param[in] name Name of the message.
+ * @param[in] text The welcome message.
++ * @param[in] who Who set this message.
+ * @param[in] timestamp Timestamp of when the message was set.
+ * @param[in] flags Flags to set on welcome.
++ * @param[in] insert Non-zero do not propagate change (welcome_insert)
+ * @return Zero
+ */
+int
+welcome_do(struct Client *cptr, struct Client *sptr, char *name, char *text,
-+ char *who, time_t timestamp, unsigned int flags)
++ char *who, time_t timestamp, unsigned int flags, int insert)
+{
+ int nameint = atoi(name); /* transform to int */
+ int namearray = nameint - 1; /* used to test the array element */
-+ char oldtext[TOPICLEN + 1]; /* save old text when unsetting */
-+ static time_t rate;
++ char oldtext[WELCOMELEN + 1]; /* save old text when unsetting */
++ char msg[BUFSIZE]; /* msg for snomask, logging, etc. */
++ static time_t rate; /* rate limit snomask message */
+
+ assert(NULL != cptr);
+ assert(NULL != sptr);
+ assert(NULL != who);
+
+ /* debug */
-+ Debug((DEBUG_DEBUG, "welcome_do(\"%s\", \"%s\", \"%s\", \"%s\" \"%s\", %Tu, 0x%04x)",
-+ cli_name(cptr), cli_name(sptr), name, text, who, timestamp, flags));
++ Debug((DEBUG_DEBUG, "welcome_do(\"%s\", \"%s\", \"%s\", \"%s\" \"%s\", %Tu, 0x%04x, %d)",
++ cli_name(cptr), cli_name(sptr), name, text, who, timestamp, flags, insert));
+
+ /* check name */
+ if (nameint < 1 || nameint > WELCOME_MAX_ENTRIES) {
+ if (IsUser(sptr))
+ sendcmdto_one(&me, CMD_NOTICE, sptr,
+ "%C :WELCOME: Invalid message number %s - should between 1 and %d",
-+ sptr, name, WELCOME_MAX_ENTRIES);
++ sptr, name, WELCOME_MAX_ENTRIES);
++ else
++ protocol_violation(cptr, "WELCOME: Invalid message number %s from %C", name, sptr);
+ return 0;
+ }
+
+ if (WelcomeArray[namearray].timestamp != 0) {
+
+ /* global */
-+ if (namearray < WELCOME_MAX_ENTRIES) {
++ if (!(flags & WELCOME_LOCAL)) {
+
+ /* netburst and we got the same or a newer one
+ *
+ if (ircd_strcmp(text, WelcomeArray[namearray].text) == 0) {
+ if (IsUser(sptr))
+ sendcmdto_one(&me, CMD_NOTICE, sptr,
-+ "%C :WELCOME: Cannot change %smessage for %s - nothing to change.",
-+ sptr, (flags & WELCOME_LOCAL) ? "local " : "", name);
++ "%C :WELCOME: Cannot change %s message for %s - nothing to change.",
++ sptr, (flags & WELCOME_LOCAL) ? "local" : "global", name);
+ return 0;
+ }
+ }
+ sptr, cli_user(sptr)->server, timestamp - TStime());
+ }
+
-+ /* unsetting - do not announce, save text */
++ /* unsetting - do not announce, do not insert, save text */
+ if (EmptyString(text)) {
+ flags &= ~WELCOME_ANNOUNCE;
-+ ircd_strncpy(oldtext, WelcomeArray[namearray].text, TOPICLEN);
++ flags &= ~WELCOME_INSERT;
++ ircd_strncpy(oldtext, WelcomeArray[namearray].text, WELCOMELEN);
+ }
+
++ /* make space if needed */
++ if (flags & WELCOME_INSERT)
++ welcome_insert(cptr, sptr, name, nameint, namearray, who, timestamp, flags);
++
+ /* update */
+ welcome_make(namearray, text, who, timestamp);
+
-+ /* inform ops */
-+ sendto_opmask_butone(0, SNO_OLDSNO, "%s %s%s%sWELCOME %d \"%s\" [%Tu]",
-+ (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
-+ get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server),
++ /* create msg for snomask, logging, etc. */
++ ircd_snprintf(0, msg, 0, "%s%s%s WELCOME %d \"%s\" [%Tu]",
+ EmptyString(text) ? "unsetting" : "changing",
+ (flags & WELCOME_ANNOUNCE) ? " and announcing " : " ",
-+ (flags & WELCOME_LOCAL) ? "local " : "",
++ (flags & WELCOME_LOCAL) ? "local" : "global",
+ nameint,
+ EmptyString(text) ? oldtext : WelcomeArray[namearray].text,
+ WelcomeArray[namearray].timestamp);
+
++ /* inform ops */
++ sendto_opmask_butone(0, SNO_OLDSNO, "%s %s",
++ (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
++ get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server), msg);
++
+ /* log it */
-+ log_write(LS_NETWORK, L_INFO, LOG_NOSNOTICE, "%#C (%s) %s%s%sWELCOME %d \"%s\" [%Tu]",
-+ sptr, WelcomeArray[namearray].who,
-+ EmptyString(text) ? "unsetting" : "changing",
-+ (flags & WELCOME_ANNOUNCE) ? " and announcing " : " ",
-+ (flags & WELCOME_LOCAL) ? "local " : "",
-+ nameint,
-+ EmptyString(text) ? oldtext : WelcomeArray[namearray].text,
-+ WelcomeArray[namearray].timestamp);
++ log_write(LS_NETWORK, L_INFO, LOG_NOSNOTICE, "%#C (%s) %s",
++ sptr, WelcomeArray[namearray].who, msg);
+
+ /* welcome set by remote user, inform oper of success */
+ if ((flags & WELCOME_LOCAL) && IsUser(sptr) && !MyUser(sptr)) {
-+ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :%s %s%s local WELCOME %d \"%s\" [%Tu]",
-+ sptr, get_client_name_and_opername(sptr),
-+ EmptyString(text) ? "unsetting" : "changing",
-+ (flags & WELCOME_ANNOUNCE) ? " and announcing" : "",
-+ nameint,
-+ EmptyString(text) ? oldtext : WelcomeArray[namearray].text,
-+ WelcomeArray[namearray].timestamp);
++ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :%s %s",
++ sptr, get_client_name_and_opername(sptr), msg);
+
+ /* TODO: wallops all local changes, by both local and remote opers? */
+ /* tell all opers about the local message being set remotely */
-+ sendwallto_group_butone(&me, WALL_WALLOPS, 0,
-+ "%s %s%s local WELCOME %d \"%s\" [%Tu]",
-+ get_client_name_and_opername(sptr),
-+ EmptyString(text) ? "unsetting" : "changing",
-+ (flags & WELCOME_ANNOUNCE) ? " and announcing" : "",
-+ nameint,
-+ EmptyString(text) ? oldtext : WelcomeArray[namearray].text,
-+ WelcomeArray[namearray].timestamp);
++ sendwallto_group_butone(&me, WALL_WALLOPS, 0, "%s %s", get_client_name_and_opername(sptr), msg);
+ }
+
+ /* propagate it */
-+ if (!(flags & WELCOME_LOCAL))
-+ sendcmdto_serv_butone(sptr, CMD_WELCOME, cptr, "* %s%d %Tu %s :%s",
-+ (flags & WELCOME_ANNOUNCE) ? "!" : "", nameint,
++ if (!(flags & WELCOME_LOCAL) && !insert)
++ sendcmdto_serv_butone(sptr, CMD_WELCOME, cptr, "* %s%s%d %Tu %s :%s",
++ (flags & WELCOME_ANNOUNCE) ? "!" : "", (flags & WELCOME_INSERT) ? "+" : "", nameint,
+ WelcomeArray[namearray].timestamp, WelcomeArray[namearray].who,
+ WelcomeArray[namearray].text);
+
+}
+
+
++/** Change a welcome message.
++ * @param[in] cptr Local client that sent us the welcome.
++ * @param[in] sptr Originator of the welcome.
++ * @param[in] name Name of the message.
++ * @param[in] nameint Name of the message.
++ * @param[in] namearray Array entry.
++ * @param[in] who Who set this message.
++ * @param[in] timestamp Timestamp of when the message was set.
++ * @param[in] flags Flags to set on welcome.
++ * @return Zero
++ */
++int
++welcome_insert(struct Client *cptr, struct Client *sptr, char *name, int nameint,
++ int namearray, char *who, time_t timestamp, unsigned int flags)
++{
++ char *text = ""; /* empty text to clear to feed to welcome_do */
++ char *last = "10"; /* last welcome message to feed to welcome_do */
++ char msg[BUFSIZE]; /* msg for snomask, logging, etc. */
++ unsigned int newflags = flags; /* new flags to feed back to welcome_do */
++ int i; /* loop variable */
++ int empty = -1; /* first empty spot array after arrayname */
++ int end = WELCOME_MAX_ENTRIES -1; /* last element to check in array */
++
++ assert(NULL != cptr);
++ assert(NULL != sptr);
++ assert(flags & WELCOME_INSERT);
++ assert(namearray >= 0 && namearray <= 2 * WELCOME_MAX_ENTRIES - 1);
++
++ /* debug */
++ Debug((DEBUG_DEBUG, "welcome_insert(\"%s\", \"%s\", \"%s\", %d, %d, \"%s\", %Tu, 0x%04x)",
++ cli_name(cptr), cli_name(sptr), name, nameint, namearray, who, timestamp, flags));
++
++ /* not set yet, do not insert */
++ if (WelcomeArray[namearray].timestamp == 0)
++ return 0;
++
++ /* last global entry */
++ if (!(flags & WELCOME_LOCAL) && (nameint == WELCOME_MAX_ENTRIES))
++ return 0;
++
++ /* last local entry */
++ if ((flags & WELCOME_LOCAL) && (nameint == 2 * WELCOME_MAX_ENTRIES))
++ return 0;
++
++ /* correct end for local offset */
++ if (flags & WELCOME_LOCAL)
++ end += WELCOME_MAX_ENTRIES;
++
++ /* found first empty spot */
++ for (i = namearray; i <= end; i++) {
++ if (*WelcomeArray[i].text == 0) {
++ empty = i;
++ break;
++ }
++ }
++
++ /* no empty spot, need to unset last, do not insert or announce */
++ if (empty == -1) {
++ newflags &= ~WELCOME_INSERT;
++ newflags &= ~WELCOME_ANNOUNCE;
++ welcome_do(cptr, sptr, last, text, who, timestamp, newflags, 1);
++ empty = end;
++ }
++
++ /* move entries down */
++ for (i = empty; i > namearray; i--)
++ welcome_make(i, WelcomeArray[i-1].text, WelcomeArray[i-1].who, WelcomeArray[i-1].timestamp);
++
++ /* correct empty for local offset */
++ if (flags & WELCOME_LOCAL)
++ empty -= WELCOME_MAX_ENTRIES;
++
++ /* create msg for snomask, logging, etc. */
++ if (nameint == empty)
++ ircd_snprintf(0, msg, 0, "moving %s WELCOME message %d one place down",
++ (flags & WELCOME_LOCAL) ? "local" : "global", nameint);
++ else
++ ircd_snprintf(0, msg, 0, "moving %s WELCOME message %d %s %d one place down",
++ (flags & WELCOME_LOCAL) ? "local" : "global", nameint, (empty - nameint > 1) ? "to" : "and" , empty);
++
++ /* inform ops */
++ sendto_opmask_butone(0, SNO_OLDSNO, "%s %s",
++ (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
++ get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server), msg);
++
++ /* log it */
++ log_write(LS_NETWORK, L_INFO, LOG_NOSNOTICE, "%#C (%s) %s", sptr, who, msg);
++
++ /* welcome set by remote user, inform oper */
++ if ((flags & WELCOME_LOCAL) && IsUser(sptr) && !MyUser(sptr)) {
++ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :%s %s",
++ sptr, get_client_name_and_opername(sptr), msg);
++
++ /* TODO: wallops all local changes, by both local and remote opers? */
++ /* tell all opers about the local message being set remotely */
++ sendwallto_group_butone(&me, WALL_WALLOPS, 0, "%s %s", get_client_name_and_opername(sptr), msg);
++ }
++ return 0;
++}
++
++
+/** Announce a welcome message to local clients.
+ * @param[in] name Welcome message to announce.
+ */