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

Add conf options for swhois and operstring, though they don't do anything yet.

This commit is contained in:
B.Greenham 2010-03-03 00:52:13 -05:00
parent 1332a0ef97
commit e787d3a226
4 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/example.conf
View File

@ -278,6 +278,17 @@ operator "god" {
*/
vhost = "is.an.oper";
/* swhois: defines an additional line that will be displayed
* whenever someone does /whois on the oper in question.
*/
swhois = "is wearing pants."
/* operstring: defines a custom operstring for this oper,
* which will be shown in whois instead of default_operstring
* or default_adminstring.
*/
operstring = "is a lazy IRC Operator"
/* flags: misc options for the operator. You may prefix an option
* with ~ to disable it, e.g. ~encrypted.
*

11
doc/reference.conf
View File

@ -491,6 +491,17 @@ operator "god" {
*/
vhost = "is.an.oper";
/* swhois: defines an additional line that will be displayed
* whenever someone does /whois on the oper in question.
*/
swhois = "is wearing pants."
/* operstring: defines a custom operstring for this oper,
* which will be shown in whois instead of default_operstring
* or default_adminstring.
*/
operstring = "is a lazy IRC Operator"
/* flags: misc options for the operator. You may prefix an option
* with ~ to disable it, e.g. ~encrypted.
*

2
include/s_newconf.h
View File

@ -120,6 +120,8 @@ struct oper_conf
unsigned int snomask;
char *vhost;
char *swhois;
char *operstring;
struct PrivilegeSet *privset;

26
src/newconf.c
View File

@ -571,10 +571,22 @@ conf_end_oper(struct TopConf *tc)
yy_tmpoper->flags = yy_oper->flags;
yy_tmpoper->umodes = yy_oper->umodes;
yy_tmpoper->snomask = yy_oper->snomask;
if(valid_hostname(yy_oper->vhost))
yy_tmpoper->vhost = rb_strdup(yy_oper->vhost);
else
conf_report_error("Ignoring vhost setting for oper %s -- invalid hostmask.", yy_oper->name);
if(strlen(yy_oper->swhois < 400))
yy_tmpoper->swhois = rb(strdup(yy_oper->swhois);
else
conf_report_error("Ignoring swhois setting for oper %s -- swhois too long.", yy_oper->name);
if(strlen(yy_oper->operstring < 400))
yy_tmpoper->operstring = rb(strdup(yy_oper->operstring);
else
conf_report_error("Ignoring operstring setting for oper %s -- operstring too long.", yy_oper->name);
yy_tmpoper->privset = yy_oper->privset;
#ifdef HAVE_LIBCRYPTO
@ -710,6 +722,18 @@ conf_set_oper_vhost(void *data)
yy_oper->vhost = rb_strdup((char *) data);
}
static void
conf_set_oper_swhois(void *data)
{
yy_oper->swhois = rb_strdup((char *) data);
}
static void
conf_set_oper_operstring(void *data)
{
yy_oper->operstring = rb_strdup((char *) data);
}
static int
conf_begin_class(struct TopConf *tc)
{
@ -2077,6 +2101,8 @@ static struct ConfEntry conf_operator_table[] =
{ "privset", CF_QSTRING, conf_set_oper_privset, 0, NULL },
{ "snomask", CF_QSTRING, conf_set_oper_snomask, 0, NULL },
{ "vhost", CF_QSTRING, conf_set_oper_vhost, 0, NULL },
{ "swhois", CF_QSTRING, conf_set_oper_swhois, 0, NULL },
{ "operstring", CF_QSTRING, conf_set_oper_operstring, 0, NULL },
{ "user", CF_QSTRING, conf_set_oper_user, 0, NULL },
{ "password", CF_QSTRING, conf_set_oper_password, 0, NULL },
{ "fingerprint", CF_QSTRING, conf_set_oper_fingerprint, 0, NULL },