remove callerid definitions

diff --git a/include/client.h b/include/client.h
index 0f132160a76c6011c9a2cecaf2f0f2da82f15b58..e43838b9115391d2c20a51e78b27e04348cc1981 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -444,7 +444,6 @@ struct ListClient
 #define UMODE_WALLOP       0x0002      /* send wallops to them */
 #define UMODE_OPERWALL     0x0004      /* Operwalls */
 #define UMODE_INVISIBLE    0x0008      /* makes user invisible */
-#define UMODE_CALLERID     0x0010      /* block unless caller id's */
 #define UMODE_LOCOPS       0x0020      /* show locops */
 #define UMODE_SERVICE      0x0040
 #define UMODE_DEAF        0x0080
@@ -535,7 +534,6 @@ struct ListClient
 #define SendLocops(x)           ((x)->umodes & UMODE_LOCOPS)
 #define SendServNotice(x)       ((x)->umodes & UMODE_SERVNOTICE)
 #define SendOperwall(x)         ((x)->umodes & UMODE_OPERWALL)
-#define IsSetCallerId(x)       ((x)->umodes & UMODE_CALLERID)
 #define IsService(x)           ((x)->umodes & UMODE_SERVICE)
 #define IsDeaf(x)              ((x)->umodes & UMODE_DEAF)
 #define IsNoForward(x)         ((x)->umodes & UMODE_NOFORWARD)

diff --git a/ircd/newconf.c b/ircd/newconf.c
index 6f8a3b584c0364c2ddbdf0109de8dc7f11cf7b57..9e200fd79716a40b58b1ba3bc04be3025df85262 100644 (file)
--- a/ircd/newconf.c
+++ b/ircd/newconf.c
@@ -316,7 +316,6 @@ struct mode_table
 
 /* *INDENT-OFF* */
 static struct mode_table umode_table[] = {
-       {"callerid",    UMODE_CALLERID  },
        {"deaf",        UMODE_DEAF      },
        {"invisible",   UMODE_INVISIBLE },
        {"locops",      UMODE_LOCOPS    },

diff --git a/ircd/s_user.c b/ircd/s_user.c
index cb4cf9db392a02273ce9b5a9e201e38c5d604bf6..bda9bca82844b71d6aa2642ff2c5bc27b06d39d4 100644 (file)
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -97,7 +97,7 @@ int user_modes[256] = {
        0,                      /* d */
        0,                      /* e */
        0,                      /* f */
-       UMODE_CALLERID,         /* g */
+       0,                      /* g */
        0,                      /* h */
        UMODE_INVISIBLE,        /* i */
        0,                      /* j */

diff --git a/ircd/supported.c b/ircd/supported.c
index 09de6ce094e074a6c0ea9351d0a5ed11b6be71f3..3dbbcd66e7dfe889a780f8fe4092d3f08559d720 100644 (file)
--- a/ircd/supported.c
+++ b/ircd/supported.c
@@ -318,7 +318,6 @@ init_isupport(void)
        add_isupport("MODES", isupport_intptr, &maxmodes);
        add_isupport("NETWORK", isupport_stringptr, &ServerInfo.network_name);
        add_isupport("STATUSMSG", isupport_string, "@+");
-       add_isupport("CALLERID", isupport_umode, "g");
        add_isupport("CASEMAPPING", isupport_string, "rfc1459");
        add_isupport("NICKLEN", isupport_nicklen, NULL);
        add_isupport("MAXNICKLEN", isupport_intptr, &maxnicklen);