CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_11_02
Commit time: 2002-10-06 09:53:58 UTC
Modified files:
Tag: u2_10_11_02
ChangeLog doc/readme.features include/ircd_features.h
ircd/ircd_features.c ircd/s_err.c ircd/s_user.c
Log message:
Author: Isomer <[EMAIL PROTECTED]>
Log message:
Adding CFV-202 support: Provider information in the 001 line
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.124.2.6 ircu2.10/ChangeLog:1.290.2.124.2.7
--- ircu2.10/ChangeLog:1.290.2.124.2.6 Sun Oct 6 02:41:35 2002
+++ ircu2.10/ChangeLog Sun Oct 6 02:53:47 2002
@@ -1,3 +1,8 @@
+2002-10-06 Perry Lorier <[EMAIL PROTECTED]>
+
+ * ircd/s_err.c, ircd/s_user.c: Add pointless spam, as required by
+ CFV-202.
+
2002-10-05 Zoot <[EMAIL PROTECTED]> (and Isomer <[EMAIL PROTECTED]>)
* ircd/m_account.c (ms_account): check the length of the account;
Index: ircu2.10/doc/readme.features
diff -u ircu2.10/doc/readme.features:1.2.2.8.2.1
ircu2.10/doc/readme.features:1.2.2.8.2.2
--- ircu2.10/doc/readme.features:1.2.2.8.2.1 Wed Oct 2 22:36:59 2002
+++ ircu2.10/doc/readme.features Sun Oct 6 02:53:47 2002
@@ -128,6 +128,13 @@
If you enable NODEFAULTMOTD, this specifies a one-line banner to be sent
to the client in addition to the instructions mentioned above.
+PROVIDER
+ * Type: string
+ * Default: NULL
+
+This string as added to the 001 numeric prefixed with "via" before the nick.
+It's used for providing promotional space to providers as per CFV-202
+
KILL_IPMISMATCH
* Type: boolean
* Default: FALSE
Index: ircu2.10/include/ircd_features.h
diff -u ircu2.10/include/ircd_features.h:1.11.2.8
ircu2.10/include/ircd_features.h:1.11.2.8.2.1
--- ircu2.10/include/ircd_features.h:1.11.2.8 Sat Sep 14 13:44:32 2002
+++ ircu2.10/include/ircd_features.h Sun Oct 6 02:53:47 2002
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: ircd_features.h,v 1.11.2.8 2002/09/14 20:44:32 kev Exp $
+ * $Id: ircd_features.h,v 1.11.2.8.2.1 2002/10/06 09:53:47 isomer Exp $
*/
struct Client;
@@ -35,6 +35,7 @@
FEAT_SERVER_PORT,
FEAT_NODEFAULTMOTD,
FEAT_MOTD_BANNER,
+ FEAT_PROVIDER,
FEAT_KILL_IPMISMATCH,
FEAT_IDLE_FROM_MSG,
FEAT_HUB,
Index: ircu2.10/ircd/ircd_features.c
diff -u ircu2.10/ircd/ircd_features.c:1.15.2.9
ircu2.10/ircd/ircd_features.c:1.15.2.9.2.1
--- ircu2.10/ircd/ircd_features.c:1.15.2.9 Sat Sep 14 13:44:32 2002
+++ ircu2.10/ircd/ircd_features.c Sun Oct 6 02:53:47 2002
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: ircd_features.c,v 1.15.2.9 2002/09/14 20:44:32 kev Exp $
+ * $Id: ircd_features.c,v 1.15.2.9.2.1 2002/10/06 09:53:47 isomer Exp $
*/
#include "config.h"
@@ -242,6 +242,7 @@
F_I(SERVER_PORT, FEAT_OPER, 4400, 0),
F_B(NODEFAULTMOTD, 0, 1, 0),
F_S(MOTD_BANNER, FEAT_NULL, 0, 0),
+ F_S(PROVIDER, FEAT_NUL, 0, 0),
F_B(KILL_IPMISMATCH, FEAT_OPER, 0, 0),
F_B(IDLE_FROM_MSG, 0, 1, 0),
F_B(HUB, 0, 0, 0),
Index: ircu2.10/ircd/s_err.c
diff -u ircu2.10/ircd/s_err.c:1.30.2.6 ircu2.10/ircd/s_err.c:1.30.2.6.2.1
--- ircu2.10/ircd/s_err.c:1.30.2.6 Sat Sep 14 13:44:32 2002
+++ ircu2.10/ircd/s_err.c Sun Oct 6 02:53:47 2002
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: s_err.c,v 1.30.2.6 2002/09/14 20:44:32 kev Exp $
+ * $Id: s_err.c,v 1.30.2.6.2.1 2002/10/06 09:53:47 isomer Exp $
*/
#include "config.h"
@@ -30,7 +30,7 @@
/* 000 */
{ 0 },
/* 001 */
- { RPL_WELCOME, ":Welcome to the Internet Relay Network %s", "001" },
+ { RPL_WELCOME, ":Welcome to the Internet Relay Network%s%s, %s", "001" },
/* 002 */
{ RPL_YOURHOST, ":Your host is %s, running version %s", "002" },
/* 003 */
Index: ircu2.10/ircd/s_user.c
diff -u ircu2.10/ircd/s_user.c:1.52.2.12 ircu2.10/ircd/s_user.c:1.52.2.12.2.1
--- ircu2.10/ircd/s_user.c:1.52.2.12 Sat Sep 14 13:44:32 2002
+++ ircu2.10/ircd/s_user.c Sun Oct 6 02:53:47 2002
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: s_user.c,v 1.52.2.12 2002/09/14 20:44:32 kev Exp $
+ * $Id: s_user.c,v 1.52.2.12.2.1 2002/10/06 09:53:47 isomer Exp $
*/
#include "config.h"
@@ -571,7 +571,12 @@
cli_handler(sptr) = CLIENT_HANDLER;
release_dns_reply(sptr);
- send_reply(sptr, RPL_WELCOME, nick);
+ send_reply(
+ sptr,
+ RPL_WELCOME,
+ strlen(feature_str(FEAT_PROVIDER)) ? " via " : "",
+ strlen(feature_str(FEAT_PROVIDER)) ? feature_str(FEAT_PROVIDER) : "",
+ nick);
/*
* This is a duplicate of the NOTICE but see below...
*/
----------------------- End of diff -----------------------
