ircd/ircd_parser.y
add PRIV_LOCAL_WELCOME PRIV_WELCOME
-diff -r 3a7d0a771452 include/client.h
+diff -r 211f48754a7f include/client.h
--- a/include/client.h
+++ b/include/client.h
@@ -142,6 +142,8 @@
PRIV_LAST_PRIV /**< number of privileges */
};
-diff -r 3a7d0a771452 include/handlers.h
+diff -r 211f48754a7f include/handlers.h
--- a/include/handlers.h
+++ b/include/handlers.h
@@ -138,6 +138,7 @@
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 3a7d0a771452 include/ircd_features.h
+diff -r 211f48754a7f include/ircd_features.h
--- a/include/ircd_features.h
+++ b/include/ircd_features.h
@@ -101,6 +101,7 @@
FEAT_HIS_STATS_w,
FEAT_HIS_STATS_x,
FEAT_HIS_STATS_y,
-diff -r 3a7d0a771452 include/msg.h
+diff -r 211f48754a7f include/msg.h
--- a/include/msg.h
+++ b/include/msg.h
@@ -196,6 +196,10 @@
#define MSG_WALLCHOPS "WALLCHOPS" /* WC */
#define TOK_WALLCHOPS "WC"
#define CMD_WALLCHOPS MSG_WALLCHOPS, TOK_WALLCHOPS
-diff -r 3a7d0a771452 include/numeric.h
+diff -r 211f48754a7f include/numeric.h
--- a/include/numeric.h
+++ b/include/numeric.h
@@ -116,6 +116,7 @@
#define ERR_SILELISTFULL 511 /* Undernet extension */
/* ERR_NOTIFYFULL 512 aircd */
/* ERR_TOOMANYWATCH 512 Numeric List: Dalnet */
-diff -r 3a7d0a771452 include/welcome.h
+diff -r 211f48754a7f include/welcome.h
--- /dev/null
+++ b/include/welcome.h
-@@ -0,0 +1,60 @@
+@@ -0,0 +1,62 @@
+#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 */
+};
+
+extern void welcome_stats(struct Client *sptr, const struct StatDesc *sd, char *param);
+
+#endif /* INCLUDED_welcome_h */
-diff -r 3a7d0a771452 ircd/Makefile.in
+diff -r 211f48754a7f ircd/Makefile.in
--- a/ircd/Makefile.in
+++ b/ircd/Makefile.in
@@ -186,6 +186,7 @@
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 3a7d0a771452 ircd/client.c
+diff -r 211f48754a7f ircd/client.c
--- a/ircd/client.c
+++ b/ircd/client.c
@@ -177,6 +177,7 @@
#undef P
{ 0, 0 }
};
-diff -r 3a7d0a771452 ircd/ircd_features.c
+diff -r 211f48754a7f ircd/ircd_features.c
--- a/ircd/ircd_features.c
+++ b/ircd/ircd_features.c
@@ -366,6 +366,7 @@
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 3a7d0a771452 ircd/ircd_lexer.l
+diff -r 211f48754a7f ircd/ircd_lexer.l
--- a/ircd/ircd_lexer.l
+++ b/ircd/ircd_lexer.l
@@ -166,6 +166,8 @@
{ NULL, 0 }
};
static int ntokens;
-diff -r 3a7d0a771452 ircd/ircd_parser.y
+diff -r 211f48754a7f ircd/ircd_parser.y
--- a/ircd/ircd_parser.y
+++ b/ircd/ircd_parser.y
@@ -189,6 +189,7 @@
TPRIV_PARANOID { $$ = PRIV_PARANOID; } ;
yesorno: YES { $$ = 1; } | NO { $$ = 0; };
-diff -r 3a7d0a771452 ircd/m_welcome.c
+diff -r 211f48754a7f ircd/m_welcome.c
--- /dev/null
+++ b/ircd/m_welcome.c
-@@ -0,0 +1,282 @@
+@@ -0,0 +1,284 @@
+/*
+ * 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 */
+ 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);
+ /* and do it */
+ return welcome_do(cptr, sptr, name, text, who, timestamp, flags);
+}
-diff -r 3a7d0a771452 ircd/parse.c
+diff -r 211f48754a7f ircd/parse.c
--- a/ircd/parse.c
+++ b/ircd/parse.c
@@ -661,6 +661,15 @@
/* 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 3a7d0a771452 ircd/s_err.c
+diff -r 211f48754a7f ircd/s_err.c
--- a/ircd/s_err.c
+++ b/ircd/s_err.c
@@ -486,7 +486,7 @@
/* 510 */
{ 0 },
/* 511 */
-diff -r 3a7d0a771452 ircd/s_serv.c
+diff -r 211f48754a7f ircd/s_serv.c
--- a/ircd/s_serv.c
+++ b/ircd/s_serv.c
@@ -57,6 +57,7 @@
/*
* Pass on my client information to the new server
-diff -r 3a7d0a771452 ircd/s_stats.c
+diff -r 211f48754a7f ircd/s_stats.c
--- a/ircd/s_stats.c
+++ b/ircd/s_stats.c
@@ -54,6 +54,7 @@
{ 'x', "memusage", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_x,
stats_meminfo, 0,
"List usage information." },
-diff -r 3a7d0a771452 ircd/s_user.c
+diff -r 211f48754a7f ircd/s_user.c
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -63,6 +63,7 @@
}
else {
struct Client *acptr = user->server;
-diff -r 3a7d0a771452 ircd/welcome.c
+diff -r 211f48754a7f ircd/welcome.c
--- /dev/null
+++ b/ircd/welcome.c
-@@ -0,0 +1,369 @@
+@@ -0,0 +1,371 @@
+/*
+ * IRC - Internet Relay Chat, ircd/welcome.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+ 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
+ *
projects / irc / quakenet / snircd-patchqueue.git / blobdiff