cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove autojoin_opers 

It was broken by the away-notify patch and fixing it is more work than
the feature is useful.
This commit is contained in:
Sam Dodrill 2013-12-26 15:08:55 -08:00
parent 755b88c783
commit 0785419045
5 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/example.conf
View File

@ -198,11 +198,6 @@ auth {
*/ */
autojoin = "#shadowircd,#test"; autojoin = "#shadowircd,#test";
/* autojoin_opers : Channel (or channels, comma-seperated) to join
* opers to on oper-up.
*/
autojoin_opers = "#opers,#help";
/* Possible flags in auth: /* Possible flags in auth:
* *
* encrypted | password is encrypted with mkpasswd * encrypted | password is encrypted with mkpasswd

5
doc/reference.charybdis.conf
View File

@ -373,11 +373,6 @@ auth {
*/ */
autojoin = "#shadowircd,#test"; autojoin = "#shadowircd,#test";
/* autojoin_opers : Channel (or channels, comma-seperated) to join
* opers to on oper-up.
*/
autojoin_opers = "#opers,#help";
/* Possible flags in auth: /* Possible flags in auth:
* *
* encrypted | password is encrypted with mkpasswd * encrypted | password is encrypted with mkpasswd

5
doc/reference.conf
View File

@ -376,11 +376,6 @@ auth {
*/ */
autojoin = "#shadowircd,#test"; autojoin = "#shadowircd,#test";
/* autojoin_opers : Channel (or channels, comma-seperated) to join
* opers to on oper-up.
*/
autojoin_opers = "#opers,#help";
/* Possible flags in auth: /* Possible flags in auth:
* *
* encrypted | password is encrypted with mkpasswd * encrypted | password is encrypted with mkpasswd

10
src/newconf.c
View File

@ -1086,15 +1086,6 @@ conf_set_auth_autojoin(void *data)
yy_aconf->autojoin = rb_strdup(data); yy_aconf->autojoin = rb_strdup(data);
} }
static void
conf_set_auth_autojoin_opers(void *data)
{
if(yy_aconf->autojoin_opers)
memset(yy_aconf->autojoin_opers, 0, strlen(yy_aconf->autojoin_opers));
rb_free(yy_aconf->autojoin_opers);
yy_aconf->autojoin_opers = rb_strdup(data);
}
static void static void
conf_set_auth_spoof(void *data) conf_set_auth_spoof(void *data)
{ {
@ -2233,7 +2224,6 @@ static struct ConfEntry conf_auth_table[] =
{ "class", CF_QSTRING, conf_set_auth_class, 0, NULL }, { "class", CF_QSTRING, conf_set_auth_class, 0, NULL },
{ "spoof", CF_QSTRING, conf_set_auth_spoof, 0, NULL }, { "spoof", CF_QSTRING, conf_set_auth_spoof, 0, NULL },
{ "autojoin", CF_QSTRING, conf_set_auth_autojoin, 0, NULL }, { "autojoin", CF_QSTRING, conf_set_auth_autojoin, 0, NULL },
{ "autojoin_opers", CF_QSTRING, conf_set_auth_autojoin_opers, 0, NULL },
{ "redirserv", CF_QSTRING, conf_set_auth_redir_serv, 0, NULL }, { "redirserv", CF_QSTRING, conf_set_auth_redir_serv, 0, NULL },
{ "redirport", CF_INT, conf_set_auth_redir_port, 0, NULL }, { "redirport", CF_INT, conf_set_auth_redir_port, 0, NULL },
{ "flags", CF_STRING | CF_FLIST, conf_set_auth_flags, 0, NULL }, { "flags", CF_STRING | CF_FLIST, conf_set_auth_flags, 0, NULL },

10
src/s_user.c
View File

@ -1431,16 +1431,6 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
aconf = source_p->localClient->att_conf; aconf = source_p->localClient->att_conf;
/* Do the auth::autojoin_opers wizardry here */
if(aconf->autojoin_opers != NULL)
{
/* opers should never be banned from the opers channel.
* Plus this is post-umode being set so you'll pass +I $o or +O.
* Hence why we're making this a normal clean join. --jdhore
*/
user_join(&me, source_p, aconf->autojoin_opers, NULL);
}
/* If we're setting +p, expire it */ /* If we're setting +p, expire it */
if(ConfigFileEntry.expire_override_time && MyClient(source_p) && source_p->umodes & UMODE_OVERRIDE) if(ConfigFileEntry.expire_override_time && MyClient(source_p) && source_p->umodes & UMODE_OVERRIDE)
{ {