diff --git a/Changes b/Changes index d46009d15..1ca6becc9 100644 --- a/Changes +++ b/Changes @@ -1898,4 +1898,3 @@ seen. gmtime warning still there Feature suggested Gargo (#0000603). - Fixed a bug in coadmin: global flags were not added (#0000716). - Made ".. did a /whois on you" always show the real host (#0000705). -- Added set::options::owner-gets-dot which will give chanowners a . prefix. diff --git a/include/common.h b/include/common.h index 9108ad208..b624ca5e9 100644 --- a/include/common.h +++ b/include/common.h @@ -264,7 +264,7 @@ extern struct SLink *find_user_link( /* struct SLink *, struct Client * */ ); MAXSILES, \ MAXMODEPARAMS, \ "#", \ - (OWNER_GETS_DOT ? "(qohv).@%+" : "(ohv)@%+"), \ + "(ohv)@%+", \ "ohvbeqa", \ "kfL", \ "l", \ diff --git a/include/dynconf.h b/include/dynconf.h index 59298a40f..9179c230a 100644 --- a/include/dynconf.h +++ b/include/dynconf.h @@ -61,7 +61,6 @@ struct zConfiguration { unsigned ident_check:1; unsigned fail_oper_warn:1; unsigned show_connect_info:1; - unsigned owner_gets_dot:1; unsigned use_egd; long host_timeout; int host_retries; @@ -112,7 +111,6 @@ extern aConfiguration iConf; #define IDENT_CHECK iConf.ident_check #define FAILOPER_WARN iConf.fail_oper_warn #define SHOWCONNECTINFO iConf.show_connect_info -#define OWNER_GETS_DOT iConf.owner_gets_dot #define OPER_ONLY_STATS iConf.oper_only_stats #define ANTI_SPAM_QUIT_MSG_TIME iConf.anti_spam_quit_message_time #define USE_EGD iConf.use_egd diff --git a/src/channel.c b/src/channel.c index 25d0b031b..b751babdd 100644 --- a/src/channel.c +++ b/src/channel.c @@ -4451,9 +4451,7 @@ CMD_FUNC(m_names) CHFL_CHANOWNER)) && acptr != sptr) continue; - if (OWNER_GETS_DOT && (cm->flags & CHFL_CHANOWNER)) - buf[idx++] = '.'; - else if (cm->flags & CHFL_CHANOP) + if (cm->flags & CHFL_CHANOWNER) buf[idx++] = '@'; else if (cm->flags & CHFL_HALFOP) buf[idx++] = '%'; diff --git a/src/modules/m_who.c b/src/modules/m_who.c index 5c2ae0540..d98ad7d55 100644 --- a/src/modules/m_who.c +++ b/src/modules/m_who.c @@ -658,8 +658,6 @@ static void make_who_status(aClient *sptr, aClient *acptr, aChannel *channel, if (cm) { - if (OWNER_GETS_DOT && (cm->flags & CHFL_CHANOWNER)) - status[i++] = '.'; if (cm->flags & CHFL_CHANOP) status[i++] = '@'; else if (cm->flags & CHFL_HALFOP) diff --git a/src/s_conf.c b/src/s_conf.c index aaf5c6ba8..663238d1b 100644 --- a/src/s_conf.c +++ b/src/s_conf.c @@ -2110,8 +2110,6 @@ void report_dynconf(aClient *sptr) sptr->name, FAILOPER_WARN); sendto_one(sptr, ":%s %i %s :options::show-connect-info: %d", me.name, RPL_TEXT, sptr->name, SHOWCONNECTINFO); - sendto_one(sptr, ":%s %i %s :options::owner-gets-dot: %d", me.name, RPL_TEXT, - sptr->name, OWNER_GETS_DOT); sendto_one(sptr, ":%s %i %s :maxchannelsperuser: %i", me.name, RPL_TEXT, sptr->name, MAXCHANNELSPERUSER); sendto_one(sptr, ":%s %i %s :auto-join: %s", me.name, RPL_TEXT, @@ -4806,9 +4804,6 @@ int _conf_set(ConfigFile *conf, ConfigEntry *ce) else if (!strcmp(cepp->ce_varname, "show-connect-info")) { tempiConf.show_connect_info = 1; } - else if (!strcmp(cepp->ce_varname, "owner-gets-dot")) { - tempiConf.owner_gets_dot = 1; - } } } else if (!strcmp(cep->ce_varname, "hosts")) { @@ -5092,8 +5087,6 @@ int _test_set(ConfigFile *conf, ConfigEntry *ce) } else if (!strcmp(cepp->ce_varname, "show-connect-info")) { } - else if (!strcmp(cepp->ce_varname, "owner-gets-dot")) { - } else { config_error("%s:%i: unknown option set::options::%s",