struct ConnectionClass *c_class;
struct DenyConf *dconf;
struct ServerConf *sconf;
- struct qline *qconf = NULL;
struct s_map *smap;
struct Privs privs;
struct Privs privs_dirty;
%token USERMODE
%token IAUTH
%token TIMEOUT
-/* and now a lot of priviledges... */
+%token FAST
+/* and now a lot of privileges... */
%token TPRIV_CHAN_LIMIT TPRIV_MODE_LCHAN TPRIV_DEOP_LCHAN TPRIV_WALK_LCHAN
%token TPRIV_LOCAL_KILL TPRIV_REHASH TPRIV_RESTART TPRIV_DIE
%token TPRIV_GLINE TPRIV_LOCAL_GLINE TPRIV_LOCAL_JUPE TPRIV_LOCAL_BADCHAN
}
;
-/* this is an arithmatic expression */
+/* this is an arithmetic expression */
expr: NUMBER
{
$$ = $1;
$$ = $1 / $3;
}
/* leave this out until we find why it makes BSD yacc dump core -larne
- | '-' expr %prec NEG
- = {
+ | '-' expr %prec NEG {
$$ = -$2;
} */
| '(' expr ')' {
struct ConnectionClass *c_class;
add_class(name, tping, tconn, maxlinks, sendq);
c_class = find_class(name);
+ MyFree(c_class->default_umode);
c_class->default_umode = pass;
memcpy(&c_class->privs, &privs, sizeof(c_class->privs));
memcpy(&c_class->privs_dirty, &privs_dirty, sizeof(c_class->privs_dirty));
maxlinks = $3;
};
-uworldblock: UWORLD '{' uworlditems '}' ';'
-{
- if (name)
- {
- struct ConfItem *aconf = make_conf(CONF_UWORLD);
- aconf->host = name;
- }
- else
- {
- MyFree(name);
- parse_error("Bad UWorld block");
- }
- name = NULL;
-};
+uworldblock: UWORLD '{' uworlditems '}' ';';
uworlditems: uworlditem uworlditems | uworlditem;
uworlditem: uworldname | error;
uworldname: NAME '=' QSTRING ';'
{
- MyFree(name);
- DupString(name, $3);
+ struct ConfItem *aconf;
+ aconf = make_conf(CONF_UWORLD);
+ DupString(aconf->host, $3);
};
operblock: OPER '{' operitems '}' ';'
'{' clientitems '}' ';'
{
struct irc_in_addr addr;
- unsigned char addrbits;
+ unsigned char addrbits = 0;
if (ip && !ipmask_parse(ip, &addr, &addrbits)) {
parse_error("Invalid IP address in block");
MyFree(username);
MyFree(host);
MyFree(ip);
+ MyFree(pass);
} else {
struct ConfItem *aconf = make_conf(CONF_CLIENT);
aconf->username = username;
aconf->host = host;
- memcpy(&aconf->address.addr, &addr, sizeof(aconf->address.addr));
+ if (ip)
+ memcpy(&aconf->address.addr, &addr, sizeof(aconf->address.addr));
+ else
+ memset(&aconf->address.addr, 0, sizeof(aconf->address.addr));
aconf->addrbits = addrbits;
aconf->name = ip;
aconf->conn_class = c_class ? c_class : find_class("default");
aconf->maximum = maxlinks;
+ aconf->passwd = pass;
}
host = NULL;
username = NULL;
c_class = NULL;
ip = NULL;
+ pass = NULL;
};
clientitems: clientitem clientitems | clientitem;
clientitem: clienthost | clientip | clientusername | clientclass | clientpass | clientmaxlinks | error;
dconf = (struct DenyConf*) MyCalloc(1, sizeof(*dconf));
} '{' killitems '}'
{
- if (dconf->hostmask != NULL)
- {
- if (dconf->usermask == NULL)
- DupString(dconf->usermask, "*");
+ if (dconf->usermask || dconf->hostmask ||dconf->realmask) {
dconf->next = denyConfList;
denyConfList = dconf;
}
else
{
+ MyFree(dconf->usermask);
MyFree(dconf->hostmask);
+ MyFree(dconf->realmask);
MyFree(dconf->message);
MyFree(dconf);
parse_error("Bad kill block");
dconf = NULL;
} ';';
killitems: killitem killitems | killitem;
-killitem: killuhost | killreal | killreasonfile | killreason | error;
+killitem: killuhost | killreal | killusername | killreasonfile | killreason | error;
killuhost: HOST '=' QSTRING ';'
{
char *u, *h;
- dconf->flags &= ~DENY_FLAGS_REALNAME;
MyFree(dconf->hostmask);
MyFree(dconf->usermask);
if ((h = strchr($3, '@')) == NULL)
else
{
u = $3;
- h++;
+ *h++ = '\0';
}
DupString(dconf->hostmask, h);
DupString(dconf->usermask, u);
ipmask_parse(dconf->hostmask, &dconf->address, &dconf->bits);
};
+killusername: USERNAME '=' QSTRING ';'
+{
+ MyFree(dconf->usermask);
+ DupString(dconf->usermask, $3);
+};
+
killreal: REAL '=' QSTRING ';'
{
- dconf->flags &= ~DENY_FLAGS_IP;
- dconf->flags |= DENY_FLAGS_REALNAME;
- MyFree(dconf->hostmask);
- /* Leave usermask so you can specify user and real... */
- DupString(dconf->hostmask, $3);
+ MyFree(dconf->realmask);
+ DupString(dconf->realmask, $3);
};
killreason: REASON '=' QSTRING ';'
stringlist[stringno++] = $1;
};
-quarantineblock: QUARANTINE '{'
-{
- qconf = (struct qline*) MyCalloc(1, sizeof(*qconf));
-} quarantineitems '}' ';'
+quarantineblock: QUARANTINE '{' quarantineitems '}' ';';
+quarantineitems: quarantineitems quarantineitem | quarantineitem;
+quarantineitem: QSTRING '=' QSTRING ';'
{
- if (qconf->chname == NULL || qconf->reason == NULL)
- {
- parse_error("quarantine blocks need a channel name and a reason.");
- return 0;
- }
+ struct qline *qconf = MyCalloc(1, sizeof(*qconf));
+ DupString(qconf->chname, $1);
+ DupString(qconf->reason, $3);
qconf->next = GlobalQuarantineList;
GlobalQuarantineList = qconf;
- qconf = NULL;
-};
-
-quarantineitems: CHANNEL NAME '=' QSTRING ';'
-{
- DupString(qconf->chname, $4);
-} | REASON '=' QSTRING ';'
-{
- DupString(qconf->reason, $3);
};
pseudoblock: PSEUDO QSTRING '{'
};
pseudoitems: pseudoitem pseudoitems | pseudoitem;
-pseudoitem: pseudoname | pseudoprepend | pseudonick | error;
+pseudoitem: pseudoname | pseudoprepend | pseudonick | pseudoflags | error;
pseudoname: NAME '=' QSTRING ';'
{
DupString(smap->name, $3);
smap->services = nh;
}
};
+pseudoflags: FAST ';'
+{
+ smap->flags |= SMAP_FAST;
+};
iauthblock: IAUTH '{'
{